X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-vk0-f47.google.com (mail-vk0-f47.google.com [209.85.213.47]) by lists.alpinelinux.org (Postfix) with ESMTP id 247655C5021 for ; Wed, 30 May 2018 09:05:42 +0000 (GMT) Received: by mail-vk0-f47.google.com with SMTP id 128-v6so5280519vkf.8 for ; Wed, 30 May 2018 02:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=JZ4OVoD0XDjBgvPuvtSMacWVNffS3nZvGoYDuFvdeis=; b=W/yCzgwccl4its/jflOBHLndQK/v1s0NCIt2tRla4msPYUL+hqOswFUUFVQN+EclB6 5eJcA0TSZL9HbGOy/D9144SEc8cMwAhVkAcGWwx/+ORBcf9NY9JwkGuUf0PHRIyCqvbt +1ovPaTJZxjJwRKZcUdRaU9h8SrBlaOq+QBQp9zp1hbaAZg0qLcDqaIrhsot5lEq1bxH Kk2HhBFm67SiY1ZosO8IJ6wwThdTNko9xtkzxm8rZ0gY1bDmkuTyWrIkT34NuIefYtYL UxwLaxO5tV2ryz/zkG41S0iDD2/AMklgqH5x1hqS1u+MYPjJqLTDofz1L5nbhzwEyYNj 6kCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=JZ4OVoD0XDjBgvPuvtSMacWVNffS3nZvGoYDuFvdeis=; b=LYf3p3QGalo8Piavoyf+Q0nH9fERKlFD1AdBXA3W1f47yhsqB8l1a118tuv1wsCyij XJJfcHNHcUXdo/0bTWeeADh+VJZwEgI7YujbBxrPqCkRtO0IZGbhQlw4zv9959maYJgV PluSV3Alo+YnUc4u7UU4Tw+O3k7NFiTwOe90qIx4K3QKfxTfQ9PaX4zg3js5l3rgYA95 6MfInHXKtbaXrEpR3qrE3bnewqUgOT+hOf8kiovRF4kyMCcopWrN/JJsPOZcTDsPP0Sg Pj9/GY3zy1WXpBhW9WIzpSEa3HtpW6Yt/r/nMxxq0hPLxmn8HqeATvKkH39Un3pdncVY 0V9w== X-Gm-Message-State: ALKqPwfDGaA1mcCsnx6lLK51cSCJIJZ8PZDUa7fFp/984myvgSON0SGe S4Qo9s4+f0ZasPbuh4V/Xw0VKajNOUaya/VJND4= X-Google-Smtp-Source: ADUXVKJIZGOfz7uQtJw7ii89gkXM2e/kbvKIn0UoHcL/wCemIArWZb+Og+ro5DlLCMKJQ+82f3Uzn2z1Td8mPAXyRvw= X-Received: by 2002:a1f:4987:: with SMTP id w129-v6mr964142vka.82.1527671141527; Wed, 30 May 2018 02:05:41 -0700 (PDT) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 2002:ab0:5507:0:0:0:0:0 with HTTP; Wed, 30 May 2018 02:05:41 -0700 (PDT) In-Reply-To: <20180503201351.22742-1-dsabogalcc@gmail.com> References: <20180503201351.22742-1-dsabogalcc@gmail.com> From: Leonardo Arena Date: Wed, 30 May 2018 11:05:41 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/mupdf: upgrade to 1.13.0 To: Daniel Sabogal Cc: alpine-aports Content-Type: multipart/alternative; boundary="000000000000b973d6056d68a7c4" --000000000000b973d6056d68a7c4 Content-Type: text/plain; charset="UTF-8" Hi, sorry for the late review. It fails here with: gcc -Wl,--as-needed -Wl,--gc-sections -Wl,-s -o build/release/mupdf-x11-curl build/release/platform/x11/curl/x11_main.o build/release/platform/x11/curl/x11_image.o build/release/platform/x11/curl/pdfapp.o build/release/platform/x11/curl/curl_stream.o build/release/libmupdf.so.0 build/release/libmupdfthird.so.0 build/release/libmupkcs7.so.0 -lm -lfreetype -lharfbuzz -ljbig2dec -lcrypto -ljpeg -lopenjp2 -lz -lX11 -lXext -lcurl -lssl -lcrypto -lpthread -lrt build/release/libmupkcs7.so.0: undefined reference to `PKCS12_SAFEBAG_get0_safes' build/release/libmupkcs7.so.0: undefined reference to `PKCS12_SAFEBAG_get0_p8inf' collect2: error: ld returned 1 exit status make: *** [Makefile:402: build/release/mupdf-x11] Error 1 make: *** Waiting for unfinished jobs.... build/release/libmupkcs7.so.0: undefined reference to `PKCS12_SAFEBAG_get0_safes' build/release/libmupkcs7.so.0: undefined reference to `PKCS12_SAFEBAG_get0_p8inf' collect2: error: ld returned 1 exit status make: *** [Makefile:377: build/release/mutool] Error 1 On Thu, May 3, 2018 at 10:13 PM, Daniel Sabogal wrote: > --- > main/mupdf/APKBUILD | 22 +++++++++++++--------- > main/mupdf/openjpeg-2.1.patch | 14 -------------- > main/mupdf/shared-lib.patch | 27 ++++++++++++++++++++------- > 3 files changed, 33 insertions(+), 30 deletions(-) > delete mode 100644 main/mupdf/openjpeg-2.1.patch > > diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD > index c472980d8f..d150edfad7 100644 > --- a/main/mupdf/APKBUILD > +++ b/main/mupdf/APKBUILD > @@ -2,7 +2,7 @@ > # Contributor: Michael Zhou > # Maintainer: Daniel Sabogal > pkgname=mupdf > -pkgver=1.12.0 > +pkgver=1.13.0 > pkgrel=0 > pkgdesc="A lightweight PDF and XPS viewer" > url="http://mupdf.com" > @@ -14,9 +14,8 @@ makedepends="freetype-dev jpeg-dev jbig2dec-dev > libx11-dev libxext-dev > subpackages="$pkgname-doc $pkgname-dev $pkgname-x11:_x11 > $pkgname-gl:_gl $pkgname-tools:_tools" > options="!check" > -source="http://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.xz > +source="http://mupdf.com/downloads/archive/$pkgname-$pkgver-source.tar.gz > shared-lib.patch > - openjpeg-2.1.patch > " > > # secfixes: > @@ -38,12 +37,18 @@ prepare() { > } > > build() { > - make prefix=/usr -C "$builddir" > + cd "$builddir" > + make prefix=/usr verbose=yes all extra-apps > } > > package() { > - make prefix=/usr DESTDIR="$pkgdir" \ > - -C "$builddir" install > + cd "$builddir" > + make prefix=/usr DESTDIR="$pkgdir" install > + > + install -m755 build/release/mujstest \ > + build/release/muraster \ > + build/release/mjsgen \ > + "$pkgdir"/usr/bin > > ln -s libmupdf.so.0 "$pkgdir"/usr/lib/libmupdf.so > ln -s libmupdfthird.so.0 "$pkgdir"/usr/lib/libmupdfthird.so > @@ -80,6 +85,5 @@ _tools() { > "$subpkgdir"/usr/bin/ > } > > -sha512sums="4c9ce81e7b0e2d77e017776fd9f700bc2f695f34b7fd97be7ba113ec1b34 > 0e7046c9db7d396abf19a98b1d0c7d72f01ecc1b44fadd250d2d6c6ffdcd9799bc16 > mupdf-1.12.0-source.tar.xz > -8d3f22908060351e8bb171c7c8248662dd6ac3fb5c765ad0ce33f33c418f > 6bcfb1982ea8e97b4fefee067c675cac03f76e8b715640dfd3689e8d7738384b6536 > shared-lib.patch > -3034e7d3248d904cc23e033a6331fc7a48d8f14e85deaa7b7b7bc37d8a3b > c6c788e2fd0a866873a69c5f416d8de5b3a5b9efde4747fa50c2ea3c4b8d170aa549 > openjpeg-2.1.patch" > +sha512sums="d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab6 > 42f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707 > mupdf-1.13.0-source.tar.gz > +4b8afc681f44ccd63c5f0edc574c62b025d5f9421a1277f838b1a9c2f8bd > 630a4df39c20ef9d6e7a9b453f074ece8e64053f8d14e85c5d0cab5a105365bed9b5 > shared-lib.patch" > diff --git a/main/mupdf/openjpeg-2.1.patch b/main/mupdf/openjpeg-2.1.patch > deleted file mode 100644 > index 437e114cb9..0000000000 > --- a/main/mupdf/openjpeg-2.1.patch > +++ /dev/null > @@ -1,14 +0,0 @@ > ---- mupdf-1.12.0-source/source/fitz/load-jpx.c.orig > -+++ mupdf-1.12.0-source/source/fitz/load-jpx.c > -@@ -445,11 +445,6 @@ > - > - #else /* HAVE_LURATECH */ > - > --#define OPJ_STATIC > --#define OPJ_HAVE_INTTYPES_H > --#if !defined(_MSC_VER) || _MSC_VER >= 1600 > --#define OPJ_HAVE_STDINT_H > --#endif > - #define USE_JPIP > - > - #include > diff --git a/main/mupdf/shared-lib.patch b/main/mupdf/shared-lib.patch > index a3d039a575..b471bba1d7 100644 > --- a/main/mupdf/shared-lib.patch > +++ b/main/mupdf/shared-lib.patch > @@ -1,5 +1,5 @@ > ---- mupdf-1.12.0-source/Makefile.orig > -+++ mupdf-1.12.0-source/Makefile > +--- mupdf-1.13.0-source/Makefile.orig > ++++ mupdf-1.13.0-source/Makefile > @@ -14,7 +14,7 @@ > # Do not specify CFLAGS or LIBS on the make invocation line - specify > # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that > @@ -9,15 +9,15 @@ > LIBS += $(XLIBS) -lm > > LIBS += $(FREETYPE_LIBS) > -@@ -75,6 +75,7 @@ > - CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $< > +@@ -76,6 +76,7 @@ > + CXX_CMD = $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statement,$(CFLAGS)) > -o $@ -c $< > AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ > LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) > +LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared > -Wl,-soname,$(notdir $@) -o $@ $^ $(LIBS) > MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ > RM_CMD = $(QUIET_RM) rm -f $@ > TAGS_CMD = $(QUIET_TAGS) ctags $^ > -@@ -90,6 +91,9 @@ > +@@ -91,6 +92,9 @@ > $(AR_CMD) > $(RANLIB_CMD) > > @@ -27,14 +27,27 @@ > $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR) > $(LINK_CMD) > > -@@ -312,8 +316,8 @@ > +@@ -325,10 +329,10 @@ > > # --- Library --- > > -MUPDF_LIB = $(OUT)/libmupdf.a > -THIRD_LIB = $(OUT)/libmupdfthird.a > +-THREAD_LIB = $(OUT)/libmuthreads.a > +-PKCS7_LIB = $(OUT)/libmupkcs7.a > +MUPDF_LIB = $(OUT)/libmupdf.so.0 > +THIRD_LIB = $(OUT)/libmupdfthird.so.0 > - THREAD_LIB = $(OUT)/libmuthreads.a > ++THREAD_LIB = $(OUT)/libmuthreads.so.0 > ++PKCS7_LIB = $(OUT)/libmupkcs7.so.0 > > MUPDF_OBJ := \ > + $(FITZ_OBJ) \ > +@@ -360,7 +364,7 @@ > + $(THREAD_LIB) : $(THREAD_OBJ) > + $(PKCS7_LIB) : $(PKCS7_OBJ) > + > +-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) > ++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) > + > + # --- Tools and Apps --- > + > -- > 2.17.0 > > > > --- > Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org > Help: alpine-aports+help@lists.alpinelinux.org > --- > > --000000000000b973d6056d68a7c4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,
sorry for the late review.

<= /div>It fails here with:

gcc -Wl,--as-needed -Wl,--gc-sections -Wl,-= s -o build/release/mupdf-x11-curl build/release/platform/x11/curl/x11_main.= o build/release/platform/x11/curl/x11_image.o build/release/platform/x11/cu= rl/pdfapp.o build/release/platform/x11/curl/curl_stream.o build/release/lib= mupdf.so.0 build/release/libmupdfthird.so.0 build/release/libmupkcs7.so.0= =C2=A0 -lm -lfreetype=C2=A0 -lharfbuzz=C2=A0 -ljbig2dec=C2=A0=C2=A0 -lcrypt= o=C2=A0 -ljpeg=C2=A0=C2=A0 -lopenjp2=C2=A0 -lz -lX11 -lXext=C2=A0 -lcurl=C2= =A0 -lssl -lcrypto=C2=A0 -lpthread -lrt
build/release/libmupkcs7.so.0: u= ndefined reference to `PKCS12_SAFEBAG_get0_safes'
build/release/libm= upkcs7.so.0: undefined reference to `PKCS12_SAFEBAG_get0_p8inf'
coll= ect2: error: ld returned 1 exit status
make: *** [Makefile:402: build/re= lease/mupdf-x11] Error 1
make: *** Waiting for unfinished jobs....
bu= ild/release/libmupkcs7.so.0: undefined reference to `PKCS12_SAFEBAG_get0_sa= fes'
build/release/libmupkcs7.so.0: undefined reference to `PKCS12_S= AFEBAG_get0_p8inf'
collect2: error: ld returned 1 exit status
mak= e: *** [Makefile:377: build/release/mutool] Error 1


On Thu, May 3, 2018 at 10:1= 3 PM, Daniel Sabogal <dsabogalcc@gmail.com> wrote:
---
=C2=A0main/mupdf/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 22 ++++= +++++++++---------
=C2=A0main/mupdf/openjpeg-2.1.patch | 14 --------------
=C2=A0main/mupdf/shared-lib.patch=C2=A0 =C2=A0| 27 ++++++++++++++++++++----= ---
=C2=A03 files changed, 33 insertions(+), 30 deletions(-)
=C2=A0delete mode 100644 main/mupdf/openjpeg-2.1.patch

diff --git a/main/mupdf/APKBUILD b/main/mupdf/APKBUILD
index c472980d8f..d150edfad7 100644
--- a/main/mupdf/APKBUILD
+++ b/main/mupdf/APKBUILD
@@ -2,7 +2,7 @@
=C2=A0# Contributor: Michael Zhou <zhoumichaely@gmail.com>
=C2=A0# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
=C2=A0pkgname=3Dmupdf
-pkgver=3D1.12.0
+pkgver=3D1.13.0
=C2=A0pkgrel=3D0
=C2=A0pkgdesc=3D"A lightweight PDF and XPS viewer"
=C2=A0url=3D"http://mupdf.com"
@@ -14,9 +14,8 @@ makedepends=3D"freetype-dev jpeg-dev jbig2dec-dev li= bx11-dev libxext-dev
=C2=A0subpackages=3D"$pkgname-doc $pkgname-dev $pkgname-x11:_x11
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $pkgname-gl:_gl $pkgname-tools:_tools"
=C2=A0options=3D"!check"
-source=3D"http://mupdf.com/down= loads/archive/$pkgname-$pkgver-source.tar.xz
+source=3D"http://mupdf.co= m/downloads/archive/$pkgname-$pkgver-source.tar.gz
=C2=A0 =C2=A0 =C2=A0 =C2=A0 shared-lib.patch
-=C2=A0 =C2=A0 =C2=A0 =C2=A0openjpeg-2.1.patch
=C2=A0 =C2=A0 =C2=A0 =C2=A0 "

=C2=A0# secfixes:
@@ -38,12 +37,18 @@ prepare() {
=C2=A0}

=C2=A0build() {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0make prefix=3D/usr -C "$builddir"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$builddir"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0make prefix=3D/usr verbose=3Dyes all extra-apps=
=C2=A0}

=C2=A0package() {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0make prefix=3D/usr DESTDIR=3D"$pkgdir"= ; \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-C "$builddir&= quot; install
+=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$builddir"
+=C2=A0 =C2=A0 =C2=A0 =C2=A0make prefix=3D/usr DESTDIR=3D"$pkgdir"= ; install
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0install -m755 build/release/mujstest \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0build/release/muras= ter \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0build/release/mjsge= n \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$pkgdir"= /usr/bin

=C2=A0 =C2=A0 =C2=A0 =C2=A0 ln -s libmupdf.so.0 "$pkgdir"/usr/lib= /libmupdf.so
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ln -s libmupdfthird.so.0 "$pkgdir"/us= r/lib/libmupdfthird.so
@@ -80,6 +85,5 @@ _tools() {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "$subpkgdir&qu= ot;/usr/bin/
=C2=A0}

-sha512sums=3D"4c9ce81e7b0e2d77e017776fd9f700bc2f695f34b7fd9= 7be7ba113ec1b340e7046c9db7d396abf19a98b1d0c7d72f01ecc1b44fadd250d= 2d6c6ffdcd9799bc16=C2=A0 mupdf-1.12.0-source.tar.xz
-8d3f22908060351e8bb171c7c8248662dd6ac3fb5c765ad0ce33f33c418f6bcfb1982ea8e97b4fefee067c675cac03f76e8b715640dfd3689e8d7738384b= 6536=C2=A0 shared-lib.patch
-3034e7d3248d904cc23e033a6331fc7a48d8f14e85deaa7b7b7bc37d8a3bc6c788e2fd0a866873a69c5f416d8de5b3a5b9efde4747fa50c2ea3c4b8d170a= a549=C2=A0 openjpeg-2.1.patch"
+sha512sums=3D"d7fca7292e612959893a728d35964cf7b4e607385bdd7= 2e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1= a53c2a04ff0adbd707=C2=A0 mupdf-1.13.0-source.tar.gz
+4b8afc681f44ccd63c5f0edc574c62b025d5f9421a1277f838b1a9c2f8bd630a4df39c20ef9d6e7a9b453f074ece8e64053f8d14e85c5d0cab5a105365be= d9b5=C2=A0 shared-lib.patch"
diff --git a/main/mupdf/openjpeg-2.1.patch b/main/mupdf/openjpeg-2.1.<= wbr>patch
deleted file mode 100644
index 437e114cb9..0000000000
--- a/main/mupdf/openjpeg-2.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mupdf-1.12.0-source/source/fitz/load-jpx.c.orig
-+++ mupdf-1.12.0-source/source/fitz/load-jpx.c
-@@ -445,11 +445,6 @@
-
- #else /* HAVE_LURATECH */
-
--#define OPJ_STATIC
--#define OPJ_HAVE_INTTYPES_H
--#if !defined(_MSC_VER) || _MSC_VER >=3D 1600
--#define OPJ_HAVE_STDINT_H
--#endif
- #define USE_JPIP
-
- #include <openjpeg.h>
diff --git a/main/mupdf/shared-lib.patch b/main/mupdf/shared-lib.patch
index a3d039a575..b471bba1d7 100644
--- a/main/mupdf/shared-lib.patch
+++ b/main/mupdf/shared-lib.patch
@@ -1,5 +1,5 @@
---- mupdf-1.12.0-source/Makefile.orig
-+++ mupdf-1.12.0-source/Makefile
+--- mupdf-1.13.0-source/Makefile.orig
++++ mupdf-1.13.0-source/Makefile
=C2=A0@@ -14,7 +14,7 @@
=C2=A0 # Do not specify CFLAGS or LIBS on the make invocation line - specif= y
=C2=A0 # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile t= hat
@@ -9,15 +9,15 @@
=C2=A0 LIBS +=3D $(XLIBS) -lm

=C2=A0 LIBS +=3D $(FREETYPE_LIBS)
-@@ -75,6 +75,7 @@
- CXX_CMD =3D $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $<
+@@ -76,6 +76,7 @@
+ CXX_CMD =3D $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statemen= t,$(CFLAGS)) -o $@ -c $<
=C2=A0 AR_CMD =3D $(QUIET_AR) $(AR) cr $@ $^
=C2=A0 LINK_CMD =3D $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
=C2=A0+LINK_SHARED_CMD =3D $(QUIET_LINK) $(CC) $(LDFLAGS) -shared -Wl,-sona= me,$(notdir $@) -o $@ $^ $(LIBS)
=C2=A0 MKDIR_CMD =3D $(QUIET_MKDIR) mkdir -p $@
=C2=A0 RM_CMD =3D $(QUIET_RM) rm -f $@
=C2=A0 TAGS_CMD =3D $(QUIET_TAGS) ctags $^
-@@ -90,6 +91,9 @@
+@@ -91,6 +92,9 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $(AR_CMD)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $(RANLIB_CMD)

@@ -27,14 +27,27 @@
=C2=A0 $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $(LINK_CMD)

-@@ -312,8 +316,8 @@
+@@ -325,10 +329,10 @@

=C2=A0 # --- Library ---

=C2=A0-MUPDF_LIB =3D $(OUT)/libmupdf.a
=C2=A0-THIRD_LIB =3D $(OUT)/libmupdfthird.a
+-THREAD_LIB =3D $(OUT)/libmuthreads.a
+-PKCS7_LIB =3D $(OUT)/libmupkcs7.a
=C2=A0+MUPDF_LIB =3D $(OUT)/libmupdf.so.0
=C2=A0+THIRD_LIB =3D $(OUT)/libmupdfthird.so.0
- THREAD_LIB =3D $(OUT)/libmuthreads.a
++THREAD_LIB =3D $(OUT)/libmuthreads.so.0
++PKCS7_LIB =3D $(OUT)/libmupkcs7.so.0

=C2=A0 MUPDF_OBJ :=3D \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0$(FITZ_OBJ) \
+@@ -360,7 +364,7 @@
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+
+-INSTALL_LIBS :=3D $(MUPDF_LIB) $(THIRD_LIB)
++INSTALL_LIBS :=3D $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) +
+ # --- Tools and Apps ---
+
--
2.17.0



---
Unsubscribe:=C2=A0 alpine-aports+unsubscribe@lists.alpinelinux.org
Help:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0alpine-aports+help@lists.alpinelinux.org=
---


--000000000000b973d6056d68a7c4-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---