From: Peter Volkov Date: Sun, 28 Feb 2010 22:00:45 +0000 (+0000) Subject: Fix build issue witu USE=-nsplugin, bug #305949, thank Roman Sergeev for report. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f8e598deea10a47d84a272471ab47d44eb61177;p=gentoo.git Fix build issue witu USE=-nsplugin, bug #305949, thank Roman Sergeev for report. Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- diff --git a/app-text/djview4/ChangeLog b/app-text/djview4/ChangeLog index cd0145ca1463..73774e15cfac 100644 --- a/app-text/djview4/ChangeLog +++ b/app-text/djview4/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/djview4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.23 2010/02/01 07:35:30 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/ChangeLog,v 1.24 2010/02/28 22:00:44 pva Exp $ + + 28 Feb 2010; Peter Volkov djview4-4.5-r1.ebuild, + +files/djview4-4.5-libtool.patch: + Fix build issue witu USE=-nsplugin, bug #305949, thank Roman Sergeev for + report. *djview4-4.5-r1 (01 Feb 2010) diff --git a/app-text/djview4/Manifest b/app-text/djview4/Manifest index 6e8a1ab099ce..122af7fba55c 100644 --- a/app-text/djview4/Manifest +++ b/app-text/djview4/Manifest @@ -1,5 +1,6 @@ +AUX djview4-4.5-libtool.patch 620 RMD160 197149d84cd3cd1bf89f6f097f6e537616a2c63e SHA1 1d09eb5cd940ffc20b8a283368c2dc80e1b959e9 SHA256 c26dbd8dcc6738bf635f196054222c5c4c69b7d799b7a36f4b29819e9a8c19ec DIST djview4-4.5.tar.gz 895611 RMD160 256abad9cc6d661ba19caf209b74d9937eec4bce SHA1 d2fd259aa88f80393767f6dec921463da7820143 SHA256 8dc1d8013d51d4026a05d7ef4289c4c9b27de9d9b7d6bf960e4a9636b3b71276 -EBUILD djview4-4.5-r1.ebuild 1917 RMD160 33b0db9e9933ac8d26c654df129d4cb6e847b14d SHA1 c945489ca885ce9c52ddaad35ae60ed9b114f50c SHA256 9694c0c4e86b83350b574d9b3452b56d31bcc51573c643a9816faee892b6a1fb +EBUILD djview4-4.5-r1.ebuild 1965 RMD160 ad59921db8dd13ff22d0739a8469a31004e3cccb SHA1 a7097b293ce69bb225ce540db9a0a1c50be07994 SHA256 28b2a9c06506871a5427ecc34b6e58c416e7e95f08c84d8c9e233862bb293ceb EBUILD djview4-4.5.ebuild 1518 RMD160 2141750c2645479ca8c1dc8c8e891bbfa13eb6ad SHA1 da584df30940b96b6760fcd4704e347dec5607d5 SHA256 7643d6ea0c568acca947544449532a2ad92c2cf07cea96713a9a336b6fd43e5e -MISC ChangeLog 3067 RMD160 823bf20d67075d68f0f987bd35ac1d1e815cc01e SHA1 67c4980cc38338d3a68309c86294387e200ccd1c SHA256 04afa9e791547ff74b236c2f834ff9884b75c229e2c9a9e09386f68eb15b7e1c +MISC ChangeLog 3257 RMD160 90ab9b6930291bf7d44f29d3dc99785d96c37305 SHA1 5160de29071fb413b28a2177c23a7be6759af2e7 SHA256 d87c7f8b85ce86a3b0d8efde2f0af33feeb2ab56135291317934d510665735ba MISC metadata.xml 241 RMD160 82bb30f2baae19cecf35e2619cf41501c4b93c0f SHA1 23319951328fb53159640f97e84a8109eef97220 SHA256 674b443e9f1d7bd038d429926e64c40165401c5347f9a6e9ecb1be33c0e8ab93 diff --git a/app-text/djview4/djview4-4.5-r1.ebuild b/app-text/djview4/djview4-4.5-r1.ebuild index eb630a3098bb..4b192d068f52 100644 --- a/app-text/djview4/djview4-4.5-r1.ebuild +++ b/app-text/djview4/djview4-4.5-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.5-r1.ebuild,v 1.1 2010/02/01 07:35:30 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/djview4/djview4-4.5-r1.ebuild,v 1.2 2010/02/28 22:00:44 pva Exp $ EAPI=2 -inherit autotools versionator qt4 toolchain-funcs multilib nsplugins fdo-mime flag-o-matic +inherit eutils autotools versionator qt4 toolchain-funcs multilib nsplugins fdo-mime flag-o-matic MY_P=${PN}-$(replace_version_separator 2 '-') @@ -30,6 +30,7 @@ src_prepare() { # Force XEmbed instead of Xt-based mainloop (disable Xt autodep) sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688 + epatch "${FILESDIR}/${P}-libtool.patch" rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh} AT_M4DIR="config" eautoreconf } diff --git a/app-text/djview4/files/djview4-4.5-libtool.patch b/app-text/djview4/files/djview4-4.5-libtool.patch new file mode 100644 index 000000000000..546bea887336 --- /dev/null +++ b/app-text/djview4/files/djview4-4.5-libtool.patch @@ -0,0 +1,23 @@ +https://sourceforge.net/tracker/?func=detail&aid=2960877&group_id=32953&atid=406585 + +Index: configure.ac +=================================================================== +RCS file: /cvsroot/djvu/djview/configure.ac,v +retrieving revision 1.32 +diff -u -B -r1.32 configure.ac +--- configure.ac 12 Mar 2009 23:49:50 -0000 1.32 ++++ configure.ac 28 Feb 2010 21:42:27 -0000 +@@ -180,10 +180,10 @@ + fi + fi + ++# need libtool ++AC_DISABLE_STATIC ++AC_PROG_LIBTOOL + if test "$ac_nsdejavu" != no ; then +- # need libtool +- AC_DISABLE_STATIC +- AC_PROG_LIBTOOL + # prepare flags + NSDEJAVU_CFLAGS= + NSDEJAVU_LIBS=