[gentoo-commits] gentoo-x86 commit in app-text/mupdf/files: mupdf-1.3-openjpeg2.patch mupdf-1.3-pkg-config.patch mupdf-1.3-sys_curl.patch mupdf-1.3-forward_back.patch mupdf-1.3-zoom-2.patch mupdf-1.3-CFLAGS.patch mupdf-9999-openjpeg2.patch mupdf-9999-zoom-2.patch mupdf-9999-pkg-config.patch mupdf-9999-sys_curl.patch mupdf-9999-CFLAGS.patch mupdf-9999-forward_back.patch

[Michael Weber (xmw)]

xmw         13/08/28 10:28:18

  Added:                mupdf-1.3-openjpeg2.patch
                        mupdf-1.3-pkg-config.patch mupdf-1.3-sys_curl.patch
                        mupdf-1.3-forward_back.patch mupdf-1.3-zoom-2.patch
                        mupdf-1.3-CFLAGS.patch
  Removed:              mupdf-9999-openjpeg2.patch mupdf-9999-zoom-2.patch
                        mupdf-9999-pkg-config.patch
                        mupdf-9999-sys_curl.patch mupdf-9999-CFLAGS.patch
                        mupdf-9999-forward_back.patch
  Log:
  Version bump, rename patch files, fix desktop file.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.1                  app-text/mupdf/files/mupdf-1.3-openjpeg2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-openjpeg2.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.3-openjpeg2.patch
===================================================================
http://bugs.ghostscript.com/show_bug.cgi?id=693518

--- mupdf-1.3/Makerules
+++ mupdf-1.3/Makerules
@@ -52,8 +52,8 @@
 
 SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
 SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
 SYS_JBIG2DEC_LIBS = -ljbig2dec
 SYS_JPEG_LIBS = -ljpeg
 SYS_ZLIB_LIBS = -lz



1.1                  app-text/mupdf/files/mupdf-1.3-pkg-config.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-pkg-config.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-pkg-config.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.3-pkg-config.patch
===================================================================
no pkgconfig data for jbig2dec and jpeg
http://bugs.ghostscript.com/show_bug.cgi?id=694301

openjpeg-2
http://bugs.ghostscript.com/show_bug.cgi?id=693518

--- mupdf-1.3/platform/debian/mupdf.pc
+++ mupdf-1.3/platform/debian/mupdf.pc
@@ -4,9 +4,9 @@
 includedir=${prefix}/include
 
 Name: mupdf
 Description: Library for rendering PDF documents
-Requires.private: freetype2
+Requires: freetype2 libopenjp2 libcrypto
 Version: 0.5.0
 Libs: -L${libdir} -lmupdf
-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
+Libs.private: -lmupdf-js-none
 Cflags: -I${includedir}



1.1                  app-text/mupdf/files/mupdf-1.3-sys_curl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-sys_curl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-sys_curl.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.3-sys_curl.patch
===================================================================
--- mupdf-1.3/Makerules
+++ mupdf-1.3/Makerules
@@ -63,6 +63,8 @@
 SYS_JBIG2DEC_LIBS = -ljbig2dec
 SYS_JPEG_LIBS = -ljpeg
 SYS_ZLIB_LIBS = -lz
+SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
+SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -lpthread
 
 endif
 



1.1                  app-text/mupdf/files/mupdf-1.3-forward_back.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-forward_back.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-forward_back.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.3-forward_back.patch
===================================================================
Add F86XK_Forward and XF86XK_Back for page switch by muhpdf@××××××××.com 
on http://bugs.ghostscript.com/show_bug.cgi?id=693494

--- mupdf-1.3/platform/x11/x11_main.c
+++ mupdf-1.3/platform/x11/x11_main.c
@@ -5,6 +5,7 @@
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
+#include <X11/XF86keysym.h>
 
 #include <sys/select.h>
 #include <sys/time.h>
@@ -836,9 +837,11 @@
 						break;
 
 					case XK_Page_Up:
+					case XF86XK_Back:
 						len = 1; buf[0] = ',';
 						break;
 					case XK_Page_Down:
+					case XF86XK_Forward:
 						len = 1; buf[0] = '.';
 						break;
 					}



1.1                  app-text/mupdf/files/mupdf-1.3-zoom-2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-zoom-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-zoom-2.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.3-zoom-2.patch
===================================================================
--- mupdf-1.3/platform/x11/pdfapp.c
+++ mupdf-1.3/platform/x11/pdfapp.c
@@ -866,6 +867,7 @@
 		break;
 
 	case ' ':
+	case 'F':
 		panto = DONT_PAN;
 		if (app->numberlen > 0)
 			app->pageno += atoi(app->number);



1.1                  app-text/mupdf/files/mupdf-1.3-CFLAGS.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.3-CFLAGS.patch
===================================================================
--- mupdf-1.3/Makerules
+++ mupdf-1.3/Makerules
@@ -6,7 +6,7 @@
 CFLAGS += -Wall
 
 ifeq "$(build)" "debug"
-CFLAGS += -pipe -g -DDEBUG
+CFLAGS += -DDEBUG
 else ifeq "$(build)" "profile"
 CFLAGS += -pipe -O2 -DNDEBUG -pg
 LDFLAGS += -pg