diff options
| author |   Peter Volkov <pva@gentoo.org> | 2007-03-26 08:53:31 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2007-03-26 08:53:31 +0000 |
| commit | 413cdcde92f061bcb57936cec8b5a0e8d7bc32be (patch) | |
| tree | 31ebe3b56e4f0fc58536a5a11e0958c98d37963d | |
| parent | Remove dependency on portage, see bug 162516 (diff) | |
| download | gentoo-2-413cdcde92f061bcb57936cec8b5a0e8d7bc32be.tar.gz gentoo-2-413cdcde92f061bcb57936cec8b5a0e8d7bc32be.tar.bz2 gentoo-2-413cdcde92f061bcb57936cec8b5a0e8d7bc32be.zip | |
Fixed compilation with --as-needed. bug 172147.
(Portage version: 2.1.2.2)
| -rw-r--r-- | app-doc/kchmviewer/ChangeLog | 6 | ||||
| -rw-r--r-- | app-doc/kchmviewer/files/kchmviewer-3.0-fix-as-needed.diff | 13 | ||||
| -rw-r--r-- | app-doc/kchmviewer/kchmviewer-3.0.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog index 097676062120..72aee7b2e742 100644 --- a/app-doc/kchmviewer/ChangeLog +++ b/app-doc/kchmviewer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-doc/kchmviewer # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.24 2007/03/16 11:07:08 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.25 2007/03/26 08:53:31 pva Exp $ + + 26 Mar 2007; <pva@gentoo.org> +files/kchmviewer-3.0-fix-as-needed.diff, + kchmviewer-3.0.ebuild: + Fixed compilation with --as-needed. bug 172147. 16 Mar 2007; <pva@gentoo.org> kchmviewer-3.0.ebuild: Fixed .desktop file location. Fixed gentoo->mirror. diff --git a/app-doc/kchmviewer/files/kchmviewer-3.0-fix-as-needed.diff b/app-doc/kchmviewer/files/kchmviewer-3.0-fix-as-needed.diff new file mode 100644 index 000000000000..9d889c409d8b --- /dev/null +++ b/app-doc/kchmviewer/files/kchmviewer-3.0-fix-as-needed.diff @@ -0,0 +1,13 @@ +--- ./src/Makefile.am.orig 2007-03-13 07:22:31.000000000 +0300 ++++ ./src/Makefile.am 2007-03-26 12:38:43.000000000 +0400 +@@ -18,8 +18,8 @@ + SUBDIRS = $(LIB_KDEEXTRADIR) . pics + + # the library search path. +-kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(CHM_LIBS) \ +- $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KDEEXTRA) ++kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(LIB_KDEEXTRA) \ ++ $(CHM_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) + kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) -L../lib/chmlib/ + + METASOURCES = AUTO diff --git a/app-doc/kchmviewer/kchmviewer-3.0.ebuild b/app-doc/kchmviewer/kchmviewer-3.0.ebuild index 2fb05f2a0051..0e284ac923d8 100644 --- a/app-doc/kchmviewer/kchmviewer-3.0.ebuild +++ b/app-doc/kchmviewer/kchmviewer-3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-3.0.ebuild,v 1.3 2007/03/16 11:07:08 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-3.0.ebuild,v 1.4 2007/03/26 08:53:31 pva Exp $ inherit autotools kde-functions eutils @@ -40,6 +40,7 @@ src_unpack() { "s:{datadir}/applnk:{datadir}/applications:" admin/acinclude.m4.in # Apply patch for broken paths only when without kde. See bug #129225. epatch "${FILESDIR}"/${P}-qt-only-path-fix.diff + epatch "${FILESDIR}"/${P}-fix-as-needed.diff make -f admin/Makefile.common } |