Attachment 123407 Details for Bug 166745 – mupdf-1.0.r1,1.patch

[patch] mupdf-1.0.r1,1.patch

mupdf-1.0.r1,1.patch (text/plain), 6.12 KB, created by lichray on 2012-04-08 02:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lichray

Created: 2012-04-08 02:00:29 UTC

Size: 6.12 KB

patch

obsolete

>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 <bsd.port.pre.mk>
> .include <bsd.port.post.mk>
>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

Actions: View | Diff

Attachments on bug 166745: 123407 | 123408 | 123409 | 123410