diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-02-28 22:00:45 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-02-28 22:00:45 +0000 |
| commit | e7a0d68bb11dd7c1cc7c2abc12016d3ed86b17ac (patch) | |
| tree | ec0ef89c52eccc6bade9e6a72124ab401f2e3b62 /app-text | |
| parent | amd64 stable, security bug #305715 (diff) | |
| download | gentoo-2-e7a0d68bb11dd7c1cc7c2abc12016d3ed86b17ac.tar.gz gentoo-2-e7a0d68bb11dd7c1cc7c2abc12016d3ed86b17ac.tar.bz2 gentoo-2-e7a0d68bb11dd7c1cc7c2abc12016d3ed86b17ac.zip | |
Fix build issue witu USE=-nsplugin, bug #305949, thank Roman Sergeev for report.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/djview4/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/djview4/djview4-4.5-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-text/djview4/files/djview4-4.5-libtool.patch | 23 |
3 files changed, 32 insertions, 3 deletions
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 <pva@gentoo.org> 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/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= |