| 1 |
commit: 383eecae5f3cd37c1baed070fec6a7a3a489d70f |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 2 09:44:30 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 2 09:44:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383eecae |
| 7 |
|
| 8 |
app-text/fbpdf: fix build failure against app-text/mupdf-1.11, bug #623468 |
| 9 |
|
| 10 |
app-text/mupdf 1.11 does not provide mupdfthird library anymore |
| 11 |
and build fails as: |
| 12 |
|
| 13 |
x86_64-pc-linux-gnu-gcc -o fbpdf fbpdf.o mupdf.o draw.o -Wl,-O1 -Wl,--as-needed -lmupdf -lmupdfthird -lcrypto -lm |
| 14 |
/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lmupdfthird |
| 15 |
collect2: error: ld returned 1 exit status |
| 16 |
|
| 17 |
Now app-text/mupdf provides single 'mupdf' library. |
| 18 |
|
| 19 |
Reported-by: Toralf Förster |
| 20 |
Bug: https://bugs.gentoo.org/623468 |
| 21 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 22 |
|
| 23 |
app-text/fbpdf/fbpdf-0_p20161202.ebuild | 5 ++++- |
| 24 |
app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch | 9 +++++++++ |
| 25 |
2 files changed, 13 insertions(+), 1 deletion(-) |
| 26 |
|
| 27 |
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20161202.ebuild |
| 28 |
index d7cb3668d43..02e5ea6ffd6 100644 |
| 29 |
--- a/app-text/fbpdf/fbpdf-0_p20161202.ebuild |
| 30 |
+++ b/app-text/fbpdf/fbpdf-0_p20161202.ebuild |
| 31 |
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}" |
| 32 |
|
| 33 |
S=${WORKDIR}/${PN} |
| 34 |
|
| 35 |
-PATCHES=("${FILESDIR}"/${P}-format.patch) |
| 36 |
+PATCHES=( |
| 37 |
+ "${FILESDIR}"/${P}-format.patch |
| 38 |
+ "${FILESDIR}"/${P}-mupdfthird.patch |
| 39 |
+) |
| 40 |
|
| 41 |
src_compile() { |
| 42 |
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" |
| 43 |
|
| 44 |
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch |
| 45 |
new file mode 100644 |
| 46 |
index 00000000000..070b7c72ea2 |
| 47 |
--- /dev/null |
| 48 |
+++ b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch |
| 49 |
@@ -0,0 +1,9 @@ |
| 50 |
+diff --git a/Makefile b/Makefile |
| 51 |
+index f986689..374837f 100644 |
| 52 |
+--- a/Makefile |
| 53 |
++++ b/Makefile |
| 54 |
+@@ -13,3 +13,3 @@ clean: |
| 55 |
+ fbpdf: fbpdf.o mupdf.o draw.o |
| 56 |
+- $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdfthird -lcrypto -lm |
| 57 |
++ $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lcrypto -lm |
| 58 |
+ |
Archives