From owner-svn-ports-all@freebsd.org Tue Oct 9 07:01:54 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8386110C2B4F; Tue, 9 Oct 2018 07:01:54 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 39E76797DA; Tue, 9 Oct 2018 07:01:54 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34DC36BC8; Tue, 9 Oct 2018 07:01:54 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9971sgi084666; Tue, 9 Oct 2018 07:01:54 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9971rt3084664; Tue, 9 Oct 2018 07:01:53 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201810090701.w9971rt3084664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 9 Oct 2018 07:01:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481606 - in head/graphics/mupdf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/graphics/mupdf: . files X-SVN-Commit-Revision: 481606 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 07:01:54 -0000 Author: tobik Date: Tue Oct 9 07:01:53 2018 New Revision: 481606 URL: https://svnweb.freebsd.org/changeset/ports/481606 Log: graphics/mupdf: Fix linking with libmupdf.so for third-party ports libmupdf.so references symbols from libmupdfthird.so but does not link directly against it. This is problematic for ports using the --as-needed linker option, such as graphics/zathura-pdf-mupdf (>= 0.3.3) due to Meson's defaults. zathura-pdf-mupdf itself does not reference symbols from libmupdfthird.so, and so despite being included in the linker arguments, libmupdfthird.so is not actually linked in. $ zathura --version error: Could not load plugin '/usr/local/lib/zathura/libpdf-mupdf.so' (/usr/local/lib/libmupdf.so.1.13.0: Undefined symbol "js_tointeger"). This is a consequence of us providing shared libraries in spite of upstream since r433550 to keep package sizes down, but not properly understanding the dependency between libmupdfthird and libmupdf. PR: 232059 Submitted by: Albert Ou Modified: head/graphics/mupdf/Makefile head/graphics/mupdf/files/patch-Makefile Modified: head/graphics/mupdf/Makefile ============================================================================== --- head/graphics/mupdf/Makefile Tue Oct 9 06:25:23 2018 (r481605) +++ head/graphics/mupdf/Makefile Tue Oct 9 07:01:53 2018 (r481606) @@ -4,7 +4,7 @@ PORTNAME= mupdf PORTVERSION= 1.13.0 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ Modified: head/graphics/mupdf/files/patch-Makefile ============================================================================== --- head/graphics/mupdf/files/patch-Makefile Tue Oct 9 06:25:23 2018 (r481605) +++ head/graphics/mupdf/files/patch-Makefile Tue Oct 9 07:01:53 2018 (r481606) @@ -15,11 +15,12 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 st @@ -344,7 +344,11 @@ THIRD_OBJ := \ THREAD_OBJ := $(THREAD_OBJ) - $(MUPDF_LIB) : $(MUPDF_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) +-$(MUPDF_LIB) : $(MUPDF_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) + $(THIRD_LIB) : $(THIRD_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) + $(THREAD_LIB) : $(THREAD_OBJ)