From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Apr 8 01:00:32 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D228F106566B for ; Sun, 8 Apr 2012 01:00:32 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2E2EC8FC14 for ; Sun, 8 Apr 2012 01:00:30 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q3810TKs073826 for ; Sun, 8 Apr 2012 01:00:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q3810TX4073824; Sun, 8 Apr 2012 01:00:29 GMT (envelope-from gnats) Resent-Date: Sun, 8 Apr 2012 01:00:29 GMT Resent-Message-Id: <201204080100.q3810TX4073824@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zhihao Yuan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C911A1065670 for ; Sun, 8 Apr 2012 00:58:13 +0000 (UTC) (envelope-from lichray@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 8DE278FC0C for ; Sun, 8 Apr 2012 00:58:13 +0000 (UTC) Received: by iahk25 with SMTP id k25so6106348iah.13 for ; Sat, 07 Apr 2012 17:58:13 -0700 (PDT) Received: by 10.50.202.69 with SMTP id kg5mr1845278igc.7.1333846692822; Sat, 07 Apr 2012 17:58:12 -0700 (PDT) Received: from elitebook.hp (c-98-228-191-105.hsd1.il.comcast.net. [98.228.191.105]) by mx.google.com with ESMTPS id re5sm9508170igb.0.2012.04.07.17.58.09 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 07 Apr 2012 17:58:12 -0700 (PDT) Received: by elitebook.hp (sSMTP sendmail emulation); Sat, 07 Apr 2012 19:58:05 -0500 Message-Id: <4f80e2a4.458c320a.3216.ffffa206@mx.google.com> Date: Sat, 07 Apr 2012 19:58:05 -0500 From: Zhihao Yuan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/166745: [UPDATE] mupdf to 1.0rc1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Zhihao Yuan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2012 01:00:32 -0000 >Number: 166745 >Category: ports >Synopsis: [UPDATE] mupdf to 1.0rc1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 08 01:00:29 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.3-PRERELEASE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD elitebook.hp 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #5 r233751: Sat Mar 31 18:29:04 CDT 2012 lichray@elitebook.hp:/usr/obj/home/lichray/devel/freebsd-8/sys/HOUKAGO amd64 >Description: http://www.mupdf.com/news The upstream finally rename all of the binaries with a 'mu' prefix, so the old renaming hacks are dropped. This PR depends on ports/166744; openjpeg-1.5 must presents. >How-To-Repeat: >Fix: --- mupdf-1.0.r1,1.patch begins here --- diff -ruN --exclude=CVS ../mupdf.orig/Makefile ./Makefile --- ../mupdf.orig/Makefile 2011-09-17 11:22:07.000000000 -0500 +++ ./Makefile 2012-04-07 16:46:08.169065139 -0500 @@ -5,7 +5,7 @@ # $FreeBSD: ports/graphics/mupdf/Makefile,v 1.18 2011/09/17 16:22:07 dhn Exp $ PORTNAME= mupdf -PORTVERSION= 0.9 +DISTVERSION= 1.0rc1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ @@ -21,13 +21,13 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ jpeg.11:${PORTSDIR}/graphics/jpeg \ jbig2dec.0:${PORTSDIR}/graphics/jbig2dec \ - openjpeg.2:${PORTSDIR}/graphics/openjpeg + openjpeg.1:${PORTSDIR}/graphics/openjpeg USE_GMAKE= yes MAKE_ARGS+= build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man USE_XORG= x11 xext USE_GNOME= pkgconfig -MAN1= mupdf.1 mu_pdfclean.1 mu_pdfdraw.1 mu_pdfshow.1 +MAN1= mupdf.1 mupdfclean.1 mudraw.1 mupdfshow.1 MAKE_JOBS_SAFE= yes @@ -45,22 +45,15 @@ post-patch: .SILENT ${REINPLACE_CMD} \ - -e 's#\(PDF_APPS :=.*/\)#\1mu_#' \ - -e 's#\(XPS_APPS :=.*/\)#\1mu_#' \ - -e 's#\(MUPDF) :.*/\)#\1mu_#' \ - -e 's#\(OUT)/\).*: apps/#\1mu_%.o : apps/#' \ -e '/install:/,/^$$/ { /-d/d; }' \ -e '/install.*bindir)$$/s/install/$$(BSD_INSTALL_PROGRAM)/' \ -e '/install.*libdir)$$/s/install/$$(BSD_INSTALL_LIB)/' \ -e '/install.*incdir)$$/s/install/$$(BSD_INSTALL_DATA)/' \ -e '/install.*man1$$/s/install/$$(BSD_INSTALL_MAN)/' \ ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's/-O2//' \ + ${REINPLACE_CMD} -e 's/-pipe -O2 //' \ -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/Makerules -pre-install: .SILENT - ${FIND} ${WRKSRC} -name pdf\*.1 -exec ${SH} -c 'mv {} $$(dirname {})/mu_$$(basename {})' \; - .include .include diff -ruN --exclude=CVS ../mupdf.orig/distinfo ./distinfo --- ../mupdf.orig/distinfo 2011-09-17 11:22:07.000000000 -0500 +++ ./distinfo 2012-04-07 14:42:16.582579904 -0500 @@ -1,2 +1,2 @@ -SHA256 (mupdf-0.9-source.tar.gz) = abed825cb1d73e0e28f0a7ee72b5d7a451ba41d21b0c55837ed2a212f3b16b2d -SIZE (mupdf-0.9-source.tar.gz) = 3917075 +SHA256 (mupdf-1.0rc1-source.tar.gz) = 1676f6df404edc3fb965d48ad885e27dd05fbeca6ba62dac7118baba62c0af39 +SIZE (mupdf-1.0rc1-source.tar.gz) = 4262574 diff -ruN --exclude=CVS ../mupdf.orig/files/patch-apps_x11_main.c ./files/patch-apps_x11_main.c --- ../mupdf.orig/files/patch-apps_x11_main.c 2011-06-16 03:11:44.000000000 -0500 +++ ./files/patch-apps_x11_main.c 2012-04-07 14:39:35.154482011 -0500 @@ -1,18 +1,7 @@ ---- apps/x11_main.c.orig 2011-04-29 14:06:09.000000000 -0500 -+++ apps/x11_main.c 2011-06-11 02:15:12.203411543 -0500 -@@ -482,9 +482,7 @@ void winreloadfile(pdfapp_t *app) - - void winopenuri(pdfapp_t *app, char *buf) - { -- char *browser = getenv("BROWSER"); -- if (!browser) -- browser = "open"; -+ char browser[] = "xdg-open"; - if (fork() == 0) - execlp(browser, browser, buf, (char*)0); - } -@@ -563,6 +561,24 @@ static void winresettmo(struct timeval * - tmo_at->tv_usec = 0; +--- apps/x11_main.c.orig 2012-03-29 05:46:53.000000000 -0500 ++++ apps/x11_main.c 2012-04-07 14:37:40.754315181 -0500 +@@ -602,6 +602,24 @@ static void usage(void) + exit(1); } +/* reference: @@ -36,12 +25,3 @@ int main(int argc, char **argv) { int c; -@@ -571,7 +587,7 @@ int main(int argc, char **argv) - KeySym keysym; - int oldx = 0; - int oldy = 0; -- int resolution = 72; -+ int resolution = get_dpi(); - int pageno = 1; - int wasshowingpage; - struct timeval tmo, tmo_at; diff -ruN --exclude=CVS ../mupdf.orig/files/scroll_hack-apps_pdfapp.c ./files/scroll_hack-apps_pdfapp.c --- ../mupdf.orig/files/scroll_hack-apps_pdfapp.c 2011-05-17 19:25:45.000000000 -0500 +++ ./files/scroll_hack-apps_pdfapp.c 2012-04-07 16:44:01.427587313 -0500 @@ -1,22 +1,22 @@ ---- apps/pdfapp.c.orig 2011-04-29 14:06:09.000000000 -0500 -+++ apps/pdfapp.c 2011-05-16 19:58:55.650380651 -0500 -@@ -777,11 +777,15 @@ void pdfapp_onkey(pdfapp_t *app, int c) +--- apps/pdfapp.c.orig 2012-03-29 05:46:53.000000000 -0500 ++++ apps/pdfapp.c 2012-04-07 16:43:55.030462608 -0500 +@@ -774,11 +774,15 @@ void pdfapp_onkey(pdfapp_t *app, int c) break; case 'j': -+ if (app->pany + app->image->h <= app->winh) -+ goto pagedown; - app->pany -= app->image->h / 10; ++ if (app->pany + fz_pixmap_height(app->ctx, app->image) <= app->winh) ++ goto pagedown; + app->pany -= fz_pixmap_height(app->ctx, app->image) / 10; pdfapp_showpage(app, 0, 0, 1); break; case 'k': -+ if (app->pany >= 0) -+ goto pageup; - app->pany += app->image->h / 10; ++ if (app->pany >= 0) ++ goto pageup; + app->pany += fz_pixmap_height(app->ctx, app->image) / 10; pdfapp_showpage(app, 0, 0, 1); break; -@@ -843,6 +847,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) +@@ -842,6 +846,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) */ case ',': @@ -24,7 +24,7 @@ panto = PAN_TO_BOTTOM; if (app->numberlen > 0) app->pageno -= atoi(app->number); -@@ -851,6 +856,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) +@@ -850,6 +855,7 @@ void pdfapp_onkey(pdfapp_t *app, int c) break; case '.': @@ -32,11 +32,12 @@ panto = PAN_TO_TOP; if (app->numberlen > 0) app->pageno += atoi(app->number); -@@ -1022,6 +1028,11 @@ void pdfapp_onmouse(pdfapp_t *app, int x +@@ -1039,6 +1045,12 @@ void pdfapp_onmouse(pdfapp_t *app, int x int isx = (modifiers & (1<<0)); int xstep = isx ? 20 * dir : 0; int ystep = !isx ? 20 * dir : 0; -+ if (!isx && dir < 0 && app->pany + app->image->h <= app->winh) ++ if (!isx && dir < 0 && app->pany + ++ fz_pixmap_height(app->ctx, app->image) <= app->winh) + pdfapp_onkey(app, 'j'); + else if (!isx && dir > 0 && app->pany >= 0) + pdfapp_onkey(app, 'k'); diff -ruN --exclude=CVS ../mupdf.orig/pkg-plist ./pkg-plist --- ../mupdf.orig/pkg-plist 2011-05-07 09:21:43.000000000 -0500 +++ ./pkg-plist 2012-04-07 16:48:48.565161474 -0500 @@ -1,13 +1,12 @@ bin/mupdf -bin/mu_pdfclean -bin/mu_pdfdraw -bin/mu_pdfextract -bin/mu_pdfinfo -bin/mu_pdfshow -bin/mu_xpsdraw +bin/mupdfclean +bin/mudraw +bin/mupdfextract +bin/mupdfinfo +bin/mupdfshow include/fitz.h +include/memento.h +include/mucbz.h include/mupdf.h include/muxps.h lib/libfitz.a -lib/libmupdf.a -lib/libmuxps.a --- mupdf-1.0.r1,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: