From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1052177-garchives=archives.gentoo.org@lists.gentoo.org>
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 111AA138334
for <garchives@archives.gentoo.org>; Mon, 15 Oct 2018 14:43:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E6F8CE0922;
Mon, 15 Oct 2018 14:43:13 +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 A769AE0922
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Oct 2018 14:43:12 +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 55C6A335CEB
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Oct 2018 14:43:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 174843F0
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Oct 2018 14:43:07 +0000 (UTC)
From: "Virgil Dupras" <vdupras@gentoo.org>
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" <vdupras@gentoo.org>
Message-ID: <1539614498.84450c429203901c5de4e786b4413fbb5f25d731.vdupras@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/files/, app-text/mupdf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-text/mupdf/files/mupdf-1.14-Makefile.patch app-text/mupdf/files/mupdf-1.14-debug-build.patch app-text/mupdf/mupdf-1.14.0-r1.ebuild app-text/mupdf/mupdf-1.14.0.ebuild
X-VCS-Directories: app-text/mupdf/ app-text/mupdf/files/
X-VCS-Committer: vdupras
X-VCS-Committer-Name: Virgil Dupras
X-VCS-Revision: 84450c429203901c5de4e786b4413fbb5f25d731
X-VCS-Branch: master
Date: Mon, 15 Oct 2018 14:43:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0bdf81f6-861e-492b-8a36-310d9dae0969
X-Archives-Hash: 8627a86c1dc2ff0bb7ccae1515f7246e
commit: 84450c429203901c5de4e786b4413fbb5f25d731
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 15 14:41:38 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Oct 15 14:41:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84450c42
app-text/mupdf: fix shared library build
Closes: https://bugs.gentoo.org/668684
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-text/mupdf/files/mupdf-1.14-Makefile.patch | 46 ++++++++++++++++++++++
app-text/mupdf/files/mupdf-1.14-debug-build.patch | 13 ------
...{mupdf-1.14.0.ebuild => mupdf-1.14.0-r1.ebuild} | 11 ++----
3 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
new file mode 100644
index 00000000000..a8c4ef770dc
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
@@ -0,0 +1,46 @@
+1. debug build (not sure why...)
+2. build shared library
+3. add optional static lib target
+4. Don't install COPYING
+diff --git a/Makefile b/Makefile
+index 37fc48e6..4303e9fa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+
+ ifndef build
+- build := release
++ build := debug
+ endif
+
+ ifndef OUT
+@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
+
+ # --- Library ---
+
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
++MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
++MUPDF_STATIC = $(OUT)/libmupdf.a
++THIRD_LIB =
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
+-$(THIRD_LIB) : $(THIRD_OBJ)
++$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ)
++ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+
+@@ -355,7 +357,7 @@ install: libs apps
+
+ install -d $(DESTDIR)$(docdir)
+ install -d $(DESTDIR)$(docdir)/examples
+- install README COPYING CHANGES $(DESTDIR)$(docdir)
++ install README CHANGES $(DESTDIR)$(docdir)
+ install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+ install docs/examples/* $(DESTDIR)$(docdir)/examples
+
diff --git a/app-text/mupdf/files/mupdf-1.14-debug-build.patch b/app-text/mupdf/files/mupdf-1.14-debug-build.patch
deleted file mode 100644
index 6f8b5b96a97..00000000000
--- a/app-text/mupdf/files/mupdf-1.14-debug-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 37fc48e6..bd8c6049 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
-
- ifndef build
-- build := release
-+ build := debug
- endif
-
- ifndef OUT
diff --git a/app-text/mupdf/mupdf-1.14.0.ebuild b/app-text/mupdf/mupdf-1.14.0-r1.ebuild
similarity index 92%
rename from app-text/mupdf/mupdf-1.14.0.ebuild
rename to app-text/mupdf/mupdf-1.14.0-r1.ebuild
index 3bafaab5d0b..f12cf699e38 100644
--- a/app-text/mupdf/mupdf-1.14.0.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r1.ebuild
@@ -41,7 +41,7 @@ S=${WORKDIR}/${P}-source
PATCHES=(
"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.14-debug-build.patch
+ "${FILESDIR}"/${PN}-1.14-Makefile.patch
"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
# See bug #662352
"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
@@ -68,15 +68,12 @@ src_prepare() {
-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-i Makerules || die
-
- if use static-libs; then
- cp -a "${S}" "${S}"-static || die
- fi
}
_emake() {
# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
emake \
+ GENTOO_PV=${PV} \
HAVE_GLUT=$(usex opengl yes no) \
WANT_CURL=$(usex curl) \
WANT_OPENSSL=$(usex openssl) \
@@ -93,7 +90,7 @@ src_compile() {
use curl && _emake extra-apps
use static-libs && \
- _emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+ _emake build/debug/lib${PN}.a
}
src_install() {
@@ -107,7 +104,7 @@ src_install() {
_emake install
use static-libs && \
- dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+ dolib.a build/debug/lib${PN}.a
if use opengl ; then
einfo "mupdf symlink points to mupdf-gl (bug 616654)"
dosym ${PN}-gl /usr/bin/${PN}