commit: e417f177e13442dae204548c4f25bb9b8142ea12 Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> AuthorDate: Tue May 7 11:30:20 2019 +0000 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> CommitDate: Tue May 7 11:31:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e417f177
app-text/mupdf: use bundled mujs Fixes broken building process. Closes: https://bugs.gentoo.org/685244 Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 app-text/mupdf/mupdf-1.15.0.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild index 258ffd76802..440a343441f 100644 --- a/app-text/mupdf/mupdf-1.15.0.ebuild +++ b/app-text/mupdf/mupdf-1.15.0.ebuild @@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-li IUSE="X +javascript libressl opengl ssl static-libs vanilla" RDEPEND=" - >=dev-lang/mujs-1.0.4 media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?,truetype] media-libs/jbig2dec:=[static-libs?] @@ -73,15 +72,20 @@ src_prepare() { _emake() { # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings. + # We don't use system's freeglut because upstream has a special modified # version of it that gives mupdf clipboard support. See bug #653298 + + # As of v1.15.0, mupdf started using symbols in mujs that were not part + # of any release. We thus go back to using the bundled version of it. + # Bug #685244 emake \ GENTOO_PV=${PV} \ HAVE_GLUT=$(usex opengl) \ HAVE_LIBCRYPTO=$(usex ssl) \ HAVE_X11=$(usex X) \ USE_SYSTEM_LIBS=yes \ - USE_SYSTEM_MUJS=yes \ + USE_SYSTEM_MUJS=no \ USE_SYSTEM_GLUT=no \ HAVE_OBJCOPY=no \ "$@"
