From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CAD71138334 for ; Tue, 7 May 2019 11:31:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64862E092F; Tue, 7 May 2019 11:31:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 483C3E092F for ; Tue, 7 May 2019 11:31:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F55A343A4B for ; Tue, 7 May 2019 11:31:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 101C75D2 for ; Tue, 7 May 2019 11:31:45 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1557228686.e417f177e13442dae204548c4f25bb9b8142ea12.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mupdf/mupdf-1.15.0.ebuild X-VCS-Directories: app-text/mupdf/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: e417f177e13442dae204548c4f25bb9b8142ea12 X-VCS-Branch: master Date: Tue, 7 May 2019 11:31:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c3d08354-b057-41d8-a34a-5ec1ba3cca52 X-Archives-Hash: e397b710ec725b608153f38d9c55566c commit: e417f177e13442dae204548c4f25bb9b8142ea12 Author: Virgil Dupras gentoo org> AuthorDate: Tue May 7 11:30:20 2019 +0000 Commit: Virgil Dupras gentoo 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 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 \ "$@"