Remove old version, version bump (thanks radhermit, bug 385031), added patches for dpi and scrolling

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

7 files changed, 135 insertions, 101 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 3a33d564e8e3..3c649a09f79c 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.20 2011/08/23 23:07:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.21 2011/09/30 12:49:09 xmw Exp $
+
+*mupdf-0.9 (30 Sep 2011)
+
+  30 Sep 2011; Michael Weber <xmw@gentoo.org> -mupdf-0.8.15.ebuild,
+  -files/mupdf-0.8.15-buildsystem.patch, -files/mupdf-0.8.15-zoom.patch,
+  +mupdf-0.9.ebuild, +files/mupdf-0.9-dpi_hack.patch,
+  +files/mupdf-0.9-scroll_hack.patch:
+  Remove old version, version bump (thanks radhermit, bug 385031), added
+  patches for dpi and scrolling
 
   23 Aug 2011; Michael Weber <xmw@gentoo.org> mupdf-0.8.165.ebuild:
   ppc stable (bug 378427)
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 3369670a7c90..07815289f891 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mupdf-0.8.15-buildsystem.patch 424 RMD160 86c2353b985e1a767c32304c82461ee29bd8f6b0 SHA1 0c28884a67d9ed3711f4df4ab6919f37c3da3e41 SHA256 41933115b462466690b05985a1e1b0cda6194ac5a5753947d378c6d9773d1314
-AUX mupdf-0.8.15-zoom.patch 1287 RMD160 8c449b6586047318bf76ac0a125fd4322f4b5f60 SHA1 50130736687209a892557aebb69ace88ab656f91 SHA256 62a25b7342853bbac783b58c7339b3c6b85a77e20d378e239b55a46d9cacb114
 AUX mupdf-0.8.165-buildsystem.patch 488 RMD160 01672e1df7bbb3829714828ed6a5f45fa30aa578 SHA1 1c5711387b84bf751e185b427410a160c50dfd64 SHA256 3f2b801b2fcf74736916ad6268fbb186bd7d79aef9c0283de48b6f7c1412586f
 AUX mupdf-0.8.165-zoom.patch 1281 RMD160 cd4569419735c18e837821453223d27a8f6d96a5 SHA1 d8c21a355ff2dc648c33ce2e30b35b66e8b9ca49 SHA256 8215d4f9c27bf1899524046fe431890e0eb3a1390676b3ad69d97ae0eec0e3d0
-DIST mupdf-0.8.15-source.tar.gz 3837265 RMD160 0bd7e493f193f44a963e30e57d449e3503ebf7c7 SHA1 2e0f81cb99246638499995ebce79abd7c075061c SHA256 c9e7acc86c208a854e460cd07c1132039a95df0c21aa5052c4481fb540b0e03e
+AUX mupdf-0.9-dpi_hack.patch 633 RMD160 23be7c67ef6977e3ccb7b7445ef0b0977ebdfd53 SHA1 2eab36a66487e5aa777ff97924d9b3cd41e96ecd SHA256 76724555c6044864ef01dbdc6f27b7b47d705155556cb6bf7056285ad64e6341
+AUX mupdf-0.9-scroll_hack.patch 1533 RMD160 3e207e8adc85cdcf7d6f3858cae272d85e31e5b3 SHA1 d473df8c6978515638442c1ae66e198b1229a96b SHA256 a5750a052f975c55b58e27f138a0e5fa51cb118483c43a987f4aeaf2abfa0d95
 DIST mupdf-0.8.165-source.tar.gz 3775041 RMD160 2fb4c6ad4e9a4dd00cc60fd635377c353823e569 SHA1 17222ebc80a482ef7cdb190d015cefd4821028dd SHA256 cfa00870ef857def5de1a8d20e5a20b21d72a5d31ce4746953539d2299cbc59e
-EBUILD mupdf-0.8.15.ebuild 1489 RMD160 f68975ba24f9b2c130e5c6ae63d3b7e36bd57bbe SHA1 49ed1c42971a8f98a7bdc82a2d61f4200a12dbac SHA256 c4065012a49d5947e824fcef70719fb46916403d16c94929419324b6d449c9f4
+DIST mupdf-0.9-source.tar.gz 3917075 RMD160 9ba1df205f9f95c7ff4b0a3be224786ad5a65d99 SHA1 3a3ba42d19e3211199110e7c782263241cdea8a0 SHA256 abed825cb1d73e0e28f0a7ee72b5d7a451ba41d21b0c55837ed2a212f3b16b2d
 EBUILD mupdf-0.8.165.ebuild 1496 RMD160 cc120343211a3e8287010409f6b071ff77132077 SHA1 ef46f4dfbb6f40c1d31e36ca61dd2f1fb99bf5dd SHA256 ab0890d83f83aac35ff086ed8d63ac76f8bbb0f5bb29397a1bdbd77c9ac5417f
+EBUILD mupdf-0.9.ebuild 1617 RMD160 0000812e6f3903dd7d16b37a5da97c2ed57914c1 SHA1 8967b76e9a0a767912c3238fecb3a07f6a09149c SHA256 c551e16c0a439a5c9e847e97842c6514e8715a78c85881f8101f41a7beef59cf
 EBUILD mupdf-9999.ebuild 1522 RMD160 81708ffd6ee9850a64c38e44ffa94d5fcc1e8752 SHA1 8698f46877f52eeab13b92d770f3a9de2c5a24b2 SHA256 89874a9ee422e2861c315a3a2d7b9cc612ddcc67388efcb8fecf49a6fa7ffd1d
-MISC ChangeLog 3652 RMD160 d2fb0e0793223cd15fc417e7ffbe5807cdbd127e SHA1 5951139d53f7e02b3ad7b28e2fe2f4456d2e3b82 SHA256 c95be0a45de6d9a893bc510793ca481214326ccc365d7516a351038d10eae5c2
+MISC ChangeLog 4017 RMD160 456b7335c29e36435ca88f24002536a9e0a2c946 SHA1 7452cc746589935f79e8f5894564f995851dd4d1 SHA256 75550131da987cd7200d5dcbc44c66809786163ef668d639a8bd77400306b6f3
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk5/GKoACgkQfXuS5UK5QB0SKQQArqXCJIlqJL06CaU3ueKIwwnF
-VhCFMK5MqnTDWj5NGZpOi1dI3vn+LtIYKcDlSwPlyHNdlRiuafOj/EiYEXvGIs7v
-r8n1hZ6qLn7sP3m2xsOeGaVBAEPpGFGvKb3UFpekKn2J0TNisKjGoWEfK7MW6mcO
-0y7+m82yFMOm9bXadYk=
-=5ZNf
+iF4EAREIAAYFAk6FutIACgkQknrdDGLu8JDolQD/dRKEAYzb+sRZWuLWkuBJIvCt
+qV86pDePAMLtknnMrGoA/i7QvqdcbeYgFlQMg3z1KWKbFbG+768wFWxi/Lo0m93a
+=dhf8
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-0.8.15-buildsystem.patch b/app-text/mupdf/files/mupdf-0.8.15-buildsystem.patch
deleted file mode 100644
index 631cf67be90d..000000000000
--- a/app-text/mupdf/files/mupdf-0.8.15-buildsystem.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makerules
-+++ Makerules
-@@ -7,10 +7,10 @@
- CFLAGS ?=
- LDFLAGS ?=
- 
--CFLAGS += -Ifitz -Imupdf -Wall
-+CFLAGS += -Ifitz -Imupdf
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g
-+CFLAGS += 
- endif
- 
- ifeq "$(build)" "profile"
-@@ -28,7 +28,7 @@
- 
- ifeq "$(OS)" "Linux"
- SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
--X11LIBS := -lX11 -lXext
-+X11LIBS := `pkg-config --libs x11 xext`
- PDFVIEW_EXE = $(X11VIEW_EXE)
- endif
- 
diff --git a/app-text/mupdf/files/mupdf-0.8.15-zoom.patch b/app-text/mupdf/files/mupdf-0.8.15-zoom.patch
deleted file mode 100644
index ccb4a39f3429..000000000000
--- a/app-text/mupdf/files/mupdf-0.8.15-zoom.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- mupdf-0.8.15.orig/apps/man/mupdf.1
-+++ mupdf-0.8.15/apps/man/mupdf.1
-@@ -37,6 +37,15 @@
- .B \+, \-
- Zoom in or out.
- .TP
-+.B _
-+Reset zoom to default (72dpi).
-+.TP
-+.B z
-+Zoom page size to fit into the window frame.
-+.TP
-+.B Z
-+Zoom page size to fill the window frame.
-+.TP
- .B w
- Shrinkwrap window to fit the page.
- .TP
---- mupdf-0.8.15.orig/apps/pdfapp.c
-+++ mupdf-0.8.15/apps/pdfapp.c
-@@ -661,6 +661,20 @@
- 		pdfapp_showpage(app, 0, 1, 1);
- 		break;
- 
-+	case '_': // zoom to default resolution
-+		app->resolution = 72;
-+		pdfapp_showpage(app, 0, 1, 1);
-+		break;
-+
-+	case 'z': // zoom to fit window
-+	case 'Z': // zoom to fill window
-+		if ( ( c == 'Z' ) ^ ( app->image->w * app->winh > app->winw * app->image->h ) ) 
-+			app->resolution = ( app->resolution * app->winw ) / app->image->w;
-+		else
-+			app->resolution = ( app->resolution * app->winh ) / app->image->h;
-+		pdfapp_showpage(app, 0, 1, 1);
-+		break; 
-+
- 	case 'L':
- 		app->rotate -= 90;
- 		pdfapp_showpage(app, 0, 1, 1);
-@@ -784,6 +798,7 @@
- 		break;
- 
- 	case 'b':
-+	case '\b': //backspace
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno -= atoi(app->number);
-@@ -792,6 +807,7 @@
- 		break;
- 
- 	case ' ':
-+	case 'f':
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/files/mupdf-0.9-dpi_hack.patch b/app-text/mupdf/files/mupdf-0.9-dpi_hack.patch
new file mode 100644
index 000000000000..10e17ea202b4
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.9-dpi_hack.patch
@@ -0,0 +1,35 @@
+From http://aur.archlinux.org/packages.php?ID=52333
+
+--- mupdf-0.9/apps/x11_main.c
++++ mupdf-0.9/apps/x11_main.c
+@@ -539,6 +539,21 @@
+ 	exit(1);
+ }
+ 
++int get_dpi(void)
++{
++	Display *xdpy;
++	int xscr;
++	int x = 0;
++	
++	if ((xdpy = XOpenDisplay(NULL))) {
++		xscr = DefaultScreen(xdpy);
++		x = (int) (DisplayWidth(xdpy, xscr) * 25.4 /
++		DisplayWidthMM(xdpy, xscr) + 0.5);
++		XCloseDisplay(xdpy);
++	}
++	return x;
++}
++
+ int main(int argc, char **argv)
+ {
+ 	int c;
+@@ -547,7 +562,7 @@
+ 	KeySym keysym;
+ 	int oldx = 0;
+ 	int oldy = 0;
+-	int resolution = 72;
++	int resolution = get_dpi();
+ 	int pageno = 1;
+ 	int accelerate = 1;
+ 	int fd;
diff --git a/app-text/mupdf/files/mupdf-0.9-scroll_hack.patch b/app-text/mupdf/files/mupdf-0.9-scroll_hack.patch
new file mode 100644
index 000000000000..9fe63a5fd82d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-0.9-scroll_hack.patch
@@ -0,0 +1,68 @@
+From http://aur.archlinux.org/packages.php?ID=52333
+
+--- mupdf-0.9/apps/pdfapp.c
++++ mupdf-0.9/apps/pdfapp.c
+@@ -817,11 +817,15 @@
+ 		break;
+ 
+ 	case 'j':
++		if (app->pany + app->image->h <= app->winh)
++			goto pagedown;
+ 		app->pany -= app->image->h / 10;
+ 		pdfapp_showpage(app, 0, 0, 1);
+ 		break;
+ 
+ 	case 'k':
++		if (app->pany >= 0)
++			goto pageup;
+ 		app->pany += app->image->h / 10;
+ 		pdfapp_showpage(app, 0, 0, 1);
+ 		break;
+@@ -885,6 +889,7 @@
+ 	 */
+ 
+ 	case ',':
++		pageup:
+ 		panto = PAN_TO_BOTTOM;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+@@ -893,6 +898,7 @@
+ 		break;
+ 
+ 	case '.':
++		pagedown:
+ 		panto = PAN_TO_TOP;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
+@@ -902,7 +908,7 @@
+ 
+ 	case 'b':
+ 	case '\b': //backspace
+-		panto = DONT_PAN;
++		panto = PAN_TO_TOP;
+ 		if (app->numberlen > 0)
+ 			app->pageno -= atoi(app->number);
+ 		else
+@@ -911,7 +917,7 @@
+ 
+ 	case ' ':
+ 	case 'f':
+-		panto = DONT_PAN;
++		panto = PAN_TO_TOP;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
+ 		else
+@@ -1067,7 +1073,12 @@
+ 				int isx = (modifiers & (1<<0));
+ 				int xstep = isx ? 20 * dir : 0;
+ 				int ystep = !isx ? 20 * dir : 0;
+-				pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
++ 				if (!isx && dir < 0 && app->pany + app->image->h <= app->winh)
++ 					pdfapp_onkey(app, 'j');
++ 				else if (!isx && dir > 0 && app->pany >= 0)
++ 					pdfapp_onkey(app, 'k');
++ 				else
++ 					pdfapp_panview(app, app->panx + xstep, app->pany + ystep);
+ 			}
+ 		}
+ 	}
diff --git a/app-text/mupdf/mupdf-0.8.15.ebuild b/app-text/mupdf/mupdf-0.9.ebuild
index 46d6566febd2..5c49c243c40b 100644
--- a/app-text/mupdf/mupdf-0.8.15.ebuild
+++ b/app-text/mupdf/mupdf-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.8.15.ebuild,v 1.4 2011/03/30 09:29:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-0.9.ebuild,v 1.1 2011/09/30 12:49:09 xmw Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://mupdf.com/download/${P}-source.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X vanilla"
 
 RDEPEND="media-libs/freetype:2
@@ -25,21 +25,26 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-0.8.165-buildsystem.patch
 
-	use vanilla || epatch "${FILESDIR}"/${P}-zoom.patch
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-0.8.165-zoom.patch
+		epatch "${FILESDIR}"/${P}-scroll_hack.patch
+		epatch "${FILESDIR}"/${P}-dpi_hack.patch
+	fi
 }
 
 src_compile() {
 	local my_pdfexe=
-	use X || my_pdfexe="PDFVIEW_EXE="
+	use X || my_nox11="NOX11=yes MUPDF= "
 
-	emake build=debug ${my_pdfexe} CC="$(tc-getCC)" verbose=true -j1 || die
+	emake CC="$(tc-getCC)" \
+		build=debug verbose=true ${my_nox11} -j1 || die
 }
 
 src_install() {
-	emake build=debug ${my_pdfexe} prefix="${D}usr" \
-		LIBDIR="${D}usr/$(get_libdir)" verbose=true install || die
+	emake prefix="${D}usr" LIBDIR="${D}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} install || die
 
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins debian/mupdf.pc || die