Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] main/mupdf: upgrade to 1.13.0

From: Leonardo Arena <rnalrd_at_gmail.com>
Date: Wed, 30 May 2018 11:05:41 +0200

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 <dsabogalcc_at_gmail.com>
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
> _at__at_ -2,7 +2,7 @@
> # Contributor: Michael Zhou <zhoumichaely_at_gmail.com>
> # Maintainer: Daniel Sabogal <dsabogalcc_at_gmail.com>
> pkgname=mupdf
> -pkgver=1.12.0
> +pkgver=1.13.0
> pkgrel=0
> pkgdesc="A lightweight PDF and XPS viewer"
> url="http://mupdf.com"
> _at__at_ -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:
> _at__at_ -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
> _at__at_ -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
> _at__at_ -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
> -_at__at_ -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 <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
> _at__at_ -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
> _at__at_ -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
> _at__at_ -9,15 +9,15 @@
> LIBS += $(XLIBS) -lm
>
> LIBS += $(FREETYPE_LIBS)
> -_at__at_ -75,6 +75,7 @@
> - CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $_at_ -c $<
> +_at__at_ -76,6 +76,7 @@
> + CXX_CMD = $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statement,$(CFLAGS))
> -o $_at_ -c $<
> AR_CMD = $(QUIET_AR) $(AR) cr $_at_ $^
> LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $_at_ $^ $(LIBS)
> +LINK_SHARED_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -shared
> -Wl,-soname,$(notdir $_at_) -o $_at_ $^ $(LIBS)
> MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $_at_
> RM_CMD = $(QUIET_RM) rm -f $_at_
> TAGS_CMD = $(QUIET_TAGS) ctags $^
> -_at__at_ -90,6 +91,9 @@
> +_at__at_ -91,6 +92,9 @@
> $(AR_CMD)
> $(RANLIB_CMD)
>
> _at__at_ -27,14 +27,27 @@
> $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR)
> $(LINK_CMD)
>
> -_at__at_ -312,8 +316,8 @@
> +_at__at_ -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) \
> +_at__at_ -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_at_lists.alpinelinux.org
> Help: alpine-aports+help_at_lists.alpinelinux.org
> ---
>
>



---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Wed May 30 2018 - 11:05:41 GMT