Fixed compilation with --as-needed. bug 172147.

Package-Manager: portage-2.1.2.2

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index 0976760621208050c1028c20a807bf676b298bfd..72aee7b2e742616d207142707266a43c64ee3f14 100644 (file)
--- 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/Manifest b/app-doc/kchmviewer/Manifest
index 0454cb2c6cf56f9d9207a39cade750dfed92f1b4..ba17f3503a22b739e227f813021993dc462a6f2c 100644 (file)
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -6,6 +6,10 @@ AUX kchmviewer-2.6-build-Qt.diff 274 RMD160 e1fe73a8027d62a3ef211925f524a671e854
 MD5 1575cf4cdf4fbe928db99433f03b0a90 files/kchmviewer-2.6-build-Qt.diff 274
 RMD160 e1fe73a8027d62a3ef211925f524a671e8547d67 files/kchmviewer-2.6-build-Qt.diff 274
 SHA256 9b4ec1697de6e7d462638333ee9722789f98b5eb066e32d1e1cc5f8378b357ff files/kchmviewer-2.6-build-Qt.diff 274
+AUX kchmviewer-3.0-fix-as-needed.diff 561 RMD160 bf31641c72044e4afc8b37138b36a2c0183d40d0 SHA1 85c69a46c1e17e4796f0edd75086c863fcdaacf1 SHA256 93f3356a1ae588a425a0e1b9534af69e233bb09662d4b1f96388eae5ef74c3e9
+MD5 248b8714d39593093d078ea7bda738ba files/kchmviewer-3.0-fix-as-needed.diff 561
+RMD160 bf31641c72044e4afc8b37138b36a2c0183d40d0 files/kchmviewer-3.0-fix-as-needed.diff 561
+SHA256 93f3356a1ae588a425a0e1b9534af69e233bb09662d4b1f96388eae5ef74c3e9 files/kchmviewer-3.0-fix-as-needed.diff 561
 AUX kchmviewer-3.0-qt-only-path-fix.diff 412 RMD160 58568476cb155485f29b59dfcda63c41cfe86cdf SHA1 a405c2896baa1078e01a530e30f28e4beb85a04d SHA256 a3feafb48032f16ab3e1406377a9196866a5c290c8826a957160bfd6659cc0a6
 MD5 36ef853f7d8574ea59abdb9a9bc84714 files/kchmviewer-3.0-qt-only-path-fix.diff 412
 RMD160 58568476cb155485f29b59dfcda63c41cfe86cdf files/kchmviewer-3.0-qt-only-path-fix.diff 412
@@ -27,14 +31,14 @@ EBUILD kchmviewer-2.7.ebuild 1320 RMD160 d8ab55065a761c54741a02a34aff5e3c8194ca6
 MD5 3c85653278a67a0bee109b4a2b369da8 kchmviewer-2.7.ebuild 1320
 RMD160 d8ab55065a761c54741a02a34aff5e3c8194ca6a kchmviewer-2.7.ebuild 1320
 SHA256 e4163084021d39e6ff9ce0ed2a3571d404f494802caea29ca62837297873658d kchmviewer-2.7.ebuild 1320
-EBUILD kchmviewer-3.0.ebuild 1667 RMD160 e5389bba987adb48f1512fd2a2b89ef2a176ce5a SHA1 37bdfd13c27b453641ffc0e4b07d6764d531e38e SHA256 c07531a70eccae8ae82eb38015b2891b61d025dffe28b57a015907ef55c62568
-MD5 3a7f6a9d850e1fcc23a95ee9584b7259 kchmviewer-3.0.ebuild 1667
-RMD160 e5389bba987adb48f1512fd2a2b89ef2a176ce5a kchmviewer-3.0.ebuild 1667
-SHA256 c07531a70eccae8ae82eb38015b2891b61d025dffe28b57a015907ef55c62568 kchmviewer-3.0.ebuild 1667
-MISC ChangeLog 3541 RMD160 c007446d8d21a568e183bbbb2af8651ad5996f8c SHA1 9cb45fcce2375f9d04e5f019beb258b2d0e2e655 SHA256 ba6e540daabaa4627b12ccb333623343bf98b666b9c1728b45db98ad08726b0c
-MD5 c82ba73b768cea7dbdec029454c9ac83 ChangeLog 3541
-RMD160 c007446d8d21a568e183bbbb2af8651ad5996f8c ChangeLog 3541
-SHA256 ba6e540daabaa4627b12ccb333623343bf98b666b9c1728b45db98ad08726b0c ChangeLog 3541
+EBUILD kchmviewer-3.0.ebuild 1713 RMD160 ecd9699158c36ab036999adfaf6b58e3f492761f SHA1 6c75888f4f66a8666dc6425b32f929b2470cc6dc SHA256 1da24c3a99b3bdb161541645848f550e447558ca46ebdc784072cf8923305457
+MD5 47f2262508ef103c1db7370b075186a1 kchmviewer-3.0.ebuild 1713
+RMD160 ecd9699158c36ab036999adfaf6b58e3f492761f kchmviewer-3.0.ebuild 1713
+SHA256 1da24c3a99b3bdb161541645848f550e447558ca46ebdc784072cf8923305457 kchmviewer-3.0.ebuild 1713
+MISC ChangeLog 3691 RMD160 304bfcbb9421800a51548f168ad9f0308d5dbda3 SHA1 9a0aaac3d7cc754e4119e37e001b7fc1a178e840 SHA256 8d4dff5457a765b7dbcadc878a28cd1efa39333a6e8ac6995cf518a0b6e32fb6
+MD5 99a51f462289fddb113583e43cc6652d ChangeLog 3691
+RMD160 304bfcbb9421800a51548f168ad9f0308d5dbda3 ChangeLog 3691
+SHA256 8d4dff5457a765b7dbcadc878a28cd1efa39333a6e8ac6995cf518a0b6e32fb6 ChangeLog 3691
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
 MD5 07c8bb5ee028fbbae21335bd33e80318 metadata.xml 897
 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 metadata.xml 897

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 (file)
index 0000000..9d889c4
--- /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 2fb05f2a0051454fbdb18f3990fb5200ad41e6db..0e284ac923d8f773a8bba9cc1e9bcabf77a3635e 100644 (file)
--- 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
 }