diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-07 11:12:43 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-07 11:12:43 +0000 |
| commit | 5f665cbf17456a34578123860933a52169b6e221 (patch) | |
| tree | 142954c22ebb8f9531cff84c79f97c4ddfb71d6c /app-doc | |
| parent | Filled in missing deps. Not sure how this got by for this long. (diff) | |
| download | gentoo-2-5f665cbf17456a34578123860933a52169b6e221.tar.gz gentoo-2-5f665cbf17456a34578123860933a52169b6e221.tar.bz2 gentoo-2-5f665cbf17456a34578123860933a52169b6e221.zip | |
Add patch to build with GCC 4.1, patch from Sebastian T. Hafner in bug #129094.
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/kchmviewer/ChangeLog | 6 | ||||
| -rw-r--r-- | app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch | 11 | ||||
| -rw-r--r-- | app-doc/kchmviewer/kchmviewer-2.5.ebuild | 7 |
3 files changed, 20 insertions, 4 deletions
diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog index cb0fdf05bb5c..6b9732cf3f67 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.12 2006/04/06 14:48:05 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.13 2006/04/07 11:12:43 flameeyes Exp $ + + 07 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kchmviewer-2.5-gcc41.patch, kchmviewer-2.5.ebuild: + Add patch to build with GCC 4.1, patch from Sebastian T. Hafner in bug #129094. *kchmviewer-2.5 (06 Apr 2006) diff --git a/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch b/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch new file mode 100644 index 000000000000..f6fd7e656d39 --- /dev/null +++ b/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch @@ -0,0 +1,11 @@ +--- ./origin/src/iconstorage.h 2006-04-02 04:09:14.000000000 +0200 ++++ ./kchmviewer-2.5/src/iconstorage.h 2006-04-07 09:41:34.000000000 +0200 +@@ -57,7 +57,7 @@ + const QPixmap * getBookIconPixmap (unsigned int id); + const QPixmap * getToolbarPixmap (pixmap_index_t pix); + const QPixmap * getApplicationIcon(); +- const QPixmap * KCHMIconStorage::getCloseWindowIcon(); ++ const QPixmap * getCloseWindowIcon(); + + private: + const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image); diff --git a/app-doc/kchmviewer/kchmviewer-2.5.ebuild b/app-doc/kchmviewer/kchmviewer-2.5.ebuild index 9f660b26b82c..ce61cb6d1c86 100644 --- a/app-doc/kchmviewer/kchmviewer-2.5.ebuild +++ b/app-doc/kchmviewer/kchmviewer-2.5.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.5.ebuild,v 1.1 2006/04/06 14:48:05 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.5.ebuild,v 1.2 2006/04/07 11:12:43 flameeyes Exp $ inherit kde-functions eutils @@ -30,8 +30,9 @@ pkg_setup() { src_unpack() { unpack ${A} - # broken configure script, assure it doesn't fall back to internal libs - echo "# We use the external chmlib!" > chmlib/chm_lib.h + cd "${S}" + + epatch "${FILESDIR}/${P}-gcc41.patch" } src_compile() { set-kdedir 3 |