Re: CVS commit: pkgsrc/print/mupdf

[Leonardo Taccari <iamleot%gmail.com@localhost>]

Hello Thomas,

On Sun, Jun 15, 2014 at 02:14:18PM +0000, Thomas Klausner wrote:
> Log Message:
> Update to 1.5:
> This is a bugfix release: dozens of bugs have been found and
> exterminated!
> 
> A typo resulting in a potential stack overflow that could corrupt
> files when saving edits to a PDF has been fixed. Another bug which
> caused a significant slowdown has also been fixed.
> 
> We strongly recommend that you upgrade ? especially if you are
> using version 1.4.
Please apply the attached patches (they are mostly a clean-up).
>From version 1.5 mupdf automatically handle the curl dependency via
pkg-config and so we can simplify a bit our patches/*.

I've tested it on NetBSD/i386 6.1.4 both with print/mupdf (build with
"curl" option) and wip/zathura-mupdf.


Thank you,
Ciao,
L.

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo    15 Jun 2014 14:14:18 -0000      1.15
+++ distinfo    15 Jun 2014 18:19:03 -0000
@@ -3,8 +3,8 @@
 SHA1 (mupdf-1.5-source.tar.gz) = 628470ed20f9a03c81e90cd5585a31c0fab386ef
 RMD160 (mupdf-1.5-source.tar.gz) = 0ef207d3b11744fc004999917699dfd2e6873191
 Size (mupdf-1.5-source.tar.gz) = 13269193 bytes
-SHA1 (patch-Makethird) = cf6cccdd55a2edafb610d1e6d55ce9570922e750
-SHA1 (patch-ab) = 2aab2ce65ce994b4213ad738bf85e250c8e7cbb8
+SHA1 (patch-Makethird) = 5ec66437c5695558f5e6497182d1f0c197ee5299
+SHA1 (patch-ab) = b965020ec098fc1bf8577cb16102ab4c37bb37d3
 SHA1 (patch-ac) = 2b0fe5f97df7b6709ba7a3abfbefdf72ee81e0a3
 SHA1 (patch-ae) = bad4b6b8c669c752c6318bb564d1176daac30d19
 SHA1 (patch-source_fitz_load-jpx.c) = e5271cf60aff104e05ff60333be54712475d5a33
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/options.mk,v
retrieving revision 1.2
diff -u -r1.2 options.mk
--- options.mk  21 Apr 2014 16:14:40 -0000      1.2
+++ options.mk  15 Jun 2014 18:19:03 -0000
@@ -9,7 +9,6 @@
 # curl support
 #
 .if !empty(PKG_OPTIONS:Mcurl)
-MAKE_FLAGS+=   HAVE_CURL=yes
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif
Index: patches/patch-Makethird
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-Makethird,v
retrieving revision 1.3
diff -u -r1.3 patch-Makethird
--- patches/patch-Makethird     15 Jun 2014 14:14:18 -0000      1.3
+++ patches/patch-Makethird     15 Jun 2014 18:19:03 -0000
@@ -1,8 +1,6 @@
 $NetBSD: patch-Makethird,v 1.3 2014/06/15 14:14:18 wiz Exp $
 
 o mujs building support with libtool
-o libcurl (www/curl) support. By default mupdf can be installed with curl
- support *only* building it in ${WRKSRC}/thirdparty.
 
 --- Makethird.orig     2014-06-10 15:09:28.000000000 +0000
 +++ Makethird
@@ -24,13 +22,3 @@
        $(CC_CMD)
  
  MUJS_CFLAGS := -I$(MUJS_DIR)
-@@ -460,6 +460,9 @@ CURL_CFLAGS := $(SYS_CURL_CFLAGS)
- CURL_LIBS := $(SYS_CURL_LIBS)
- endif
- 
-+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
-+CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS)
-+
- # --- X11 ---
- 
- ifeq "$(HAVE_X11)" "yes"
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-ab,v
retrieving revision 1.8
diff -u -r1.8 patch-ab
--- patches/patch-ab    15 Jun 2014 14:14:18 -0000      1.8
+++ patches/patch-ab    15 Jun 2014 18:19:03 -0000
@@ -2,7 +2,6 @@
 
 o Handle the various operating systems in the same way avoiding hardcoding
 o Build and link with openjpeg-2.1
-o libcurl (www/curl) support
 
 --- Makerules.orig     2014-06-10 15:09:28.000000000 +0000
 +++ Makerules