diff options
7 files changed, 9 insertions, 120 deletions
diff --git a/app-text/zathura-pdf-mupdf/ChangeLog b/app-text/zathura-pdf-mupdf/ChangeLog index fed48bd4350d..697df94c4fb4 100644 --- a/app-text/zathura-pdf-mupdf/ChangeLog +++ b/app-text/zathura-pdf-mupdf/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-text/zathura-pdf-mupdf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.11 2014/04/04 21:25:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/ChangeLog,v 1.12 2014/04/04 21:25:49 ssuominen Exp $ + + 04 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> + -files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch, + -files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch, + -files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch, + -files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch, + -zathura-pdf-mupdf-0.2.4.ebuild, metadata.xml: + old *zathura-pdf-mupdf-0.2.6 (04 Apr 2014) diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch deleted file mode 100644 index 3581028c2052..000000000000 --- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- zathura-pdf-mupdf-9999/pdf.c -+++ zathura-pdf-mupdf-9999/pdf.c -@@ -506,7 +506,7 @@ - } - - fz_drop_pixmap(mupdf_page->ctx, pixmap); -- fz_free_display_list(mupdf_page->ctx, display_list); -+ fz_drop_display_list(mupdf_page->ctx, display_list); - - return image_buffer; - } -@@ -580,7 +580,7 @@ - } - - fz_drop_pixmap(mupdf_page->ctx, pixmap); -- fz_free_display_list(mupdf_page->ctx, display_list); -+ fz_drop_display_list(mupdf_page->ctx, display_list); - - return ZATHURA_ERROR_OK;; - } diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch deleted file mode 100644 index 5929f2a2cc2c..000000000000 --- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-fz_new_text_page.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zathura-pdf-mupdf-9999/pdf.c -+++ zathura-pdf-mupdf-9999/pdf.c -@@ -225,7 +225,7 @@ - zathura_page_set_height(page, mupdf_page->bbox.y1 - mupdf_page->bbox.y0); - - /* setup text */ -- mupdf_page->text = fz_new_text_page(mupdf_page->ctx, &mupdf_page->bbox); -+ mupdf_page->text = fz_new_text_page(mupdf_page->ctx); - if (mupdf_page->text == NULL) { - goto error_free; - } diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch deleted file mode 100644 index 9159d643b7fe..000000000000 --- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-pkgconfig.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- zathura-pdf-mupdf-9999/config.mk -+++ zathura-pdf-mupdf-9999/config.mk -@@ -29,8 +29,11 @@ - PLUGINDIR = ${LIBDIR}/zathura - endif - --INCS = ${GTK_INC} ${ZATHURA_INC} ${GIRARA_INC} --LIBS = ${GIRARA_LIB} ${GTK_LIB} -lfitz -ljbig2dec -lopenjpeg -ljpeg -+MUPDF_INC ?= $(shell pkg-config --cflags mupdf) -+MUPDF_LIB ?= $(shell pkg-config --libs mupdf) -+ -+INCS = ${GTK_INC} ${ZATHURA_INC} ${GIRARA_INC} ${MUPDF_INC} -+LIBS = ${GIRARA_LIB} ${GTK_LIB} ${MUPDF_LIB} - - # flags - CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) diff --git a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch deleted file mode 100644 index 7b7547b4afb2..000000000000 --- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-mupdf-split-headers.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- zathura-pdf-mupdf-9999/pdf.c -+++ zathura-pdf-mupdf-9999/pdf.c -@@ -6,9 +6,9 @@ - #include <ctype.h> - #include <girara/datastructures.h> - #include <glib.h> --#include <muxps.h> --#include <mupdf.h> --#include <fitz.h> -+#include <mupdf/fitz.h> -+#include <mupdf/pdf.h> -+#include <mupdf/xps.h> - - #include "pdf.h" - ---- zathura-pdf-mupdf-9999/pdf.h -+++ zathura-pdf-mupdf-9999/pdf.h -@@ -5,7 +5,6 @@ - - #include <stdbool.h> - #include <zathura/plugin-api.h> --#include <fitz.h> - - #if HAVE_CAIRO - #include <cairo.h> diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml index b5f17efa767d..e21ab424480f 100644 --- a/app-text/zathura-pdf-mupdf/metadata.xml +++ b/app-text/zathura-pdf-mupdf/metadata.xml @@ -9,9 +9,6 @@ <email>xmw@gentoo.org</email> <name>Michael Weber</name> </maintainer> - <use> - <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag> - </use> <upstream> <maintainer status="active"> <email>mlq@pwmt.org</email> diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild deleted file mode 100644 index 24ab84f7dcd1..000000000000 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.4.ebuild,v 1.1 2013/06/20 10:54:48 xmw Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="PDF plug-in for zathura" -HOMEPAGE="http://pwmt.org/projects/zathura/" -SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="!app-text/zathura-pdf-poppler - >=app-text/mupdf-1.2:= - <app-text/mupdf-9999 - >=app-text/zathura-0.2.0 - x11-libs/cairo:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - # does not render w/o cairo - myzathuraconf=( - WITH_CAIRO=1 - CC="$(tc-getCC)" - LD="$(tc-getLD)" - VERBOSE=1 - DESTDIR="${D}" - ) -} - -src_compile() { - emake "${myzathuraconf[@]}" -} - -src_install() { - emake "${myzathuraconf[@]}" install - dodoc AUTHORS -} |