Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ef27fdfc3eba53803d6346c70ae2d00aa72a9fe9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ef27fdfc3eba53803d6346c70ae2d00aa72a9fe9)
  • Date: Fri, 30 Sep 2016 02:30:28 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3
doc/zathura-pdf-mupdf/BUILD | 3
doc/zathura-pdf-mupdf/CONFLICTS | 1
doc/zathura-pdf-mupdf/DEPENDS | 2
doc/zathura-pdf-mupdf/DETAILS | 15 +++
doc/zathura-pdf-mupdf/HISTORY | 3
doc/zathura-pdf-mupdf/INSTALL | 1
doc/zathura-pdf-mupdf/PRE_BUILD | 12 ++
doc/zathura-pdf-mupdf/mupdf-1.9.patch | 151
++++++++++++++++++++++++++++++++++
9 files changed, 191 insertions(+)

New commits:
commit ef27fdfc3eba53803d6346c70ae2d00aa72a9fe9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zathura-pdf-mupdf: new spell, plugin adds PDF support to zathura

diff --git a/ChangeLog b/ChangeLog
index 1508147..e18d23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * doc/zathura-pdf-mupdf: new spell, plugin adds PDF support to zathura
+
2016-09-28 Pavel Vinogradov <public AT sourcemage.org>
* emacs-lisp/FUNCTIONS: made installation non-interactive and
without backuping loaddefs.el
diff --git a/doc/zathura-pdf-mupdf/BUILD b/doc/zathura-pdf-mupdf/BUILD
new file mode 100755
index 0000000..c072b87
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/BUILD
@@ -0,0 +1,3 @@
+OPTS="VERBOSE=1 $OPTS" &&
+
+make $OPTS
diff --git a/doc/zathura-pdf-mupdf/CONFLICTS b/doc/zathura-pdf-mupdf/CONFLICTS
new file mode 100755
index 0000000..8ceed8a
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/CONFLICTS
@@ -0,0 +1 @@
+conflicts zathura-pdf-poppler
diff --git a/doc/zathura-pdf-mupdf/DEPENDS b/doc/zathura-pdf-mupdf/DEPENDS
new file mode 100755
index 0000000..d2ac2a5
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/DEPENDS
@@ -0,0 +1,2 @@
+depends zathura &&
+depends mupdf
diff --git a/doc/zathura-pdf-mupdf/DETAILS b/doc/zathura-pdf-mupdf/DETAILS
new file mode 100755
index 0000000..517cbdb
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=zathura-pdf-mupdf
+ VERSION=0.3.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
+ SOURCE_HINTS="no-check-certificate"
+ SOURCE_HASH=sha1:ae0be41ea7c75b8ddc083fe01f1366673ea9751a:UPSTREAM_HASH
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=https://pwmt.org/projects/zathura-pdf-mupdf/
+ ENTERED=20160929
+ LICENSE[0]=ZLIB
+ SHORT="plugin adds PDF support to zathura"
+cat << EOF
+The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf
+rendering library.
+EOF
diff --git a/doc/zathura-pdf-mupdf/HISTORY b/doc/zathura-pdf-mupdf/HISTORY
new file mode 100644
index 0000000..3b61374
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/HISTORY
@@ -0,0 +1,3 @@
+2016-09-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFLICTS, mupdf-1.9.patch:
+ created spell, version 0.3.0
diff --git a/doc/zathura-pdf-mupdf/INSTALL b/doc/zathura-pdf-mupdf/INSTALL
new file mode 100755
index 0000000..c6708ed
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/INSTALL
@@ -0,0 +1 @@
+make $OPTS PREFIX="${INSTALL_ROOT}/usr" install
diff --git a/doc/zathura-pdf-mupdf/PRE_BUILD b/doc/zathura-pdf-mupdf/PRE_BUILD
new file mode 100755
index 0000000..612ae59
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p1 < "${SPELL_DIRECTORY}/mupdf-1.9.patch" &&
+
+if spell_ok openjpeg && is_version_less $(installed_version openjpeg) 2.0;
then
+ sedit "s:openjp2:openjpeg:" config.mk
+fi &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ sedit "s:-std=c11:-std=c99:" config.mk
+fi
diff --git a/doc/zathura-pdf-mupdf/mupdf-1.9.patch
b/doc/zathura-pdf-mupdf/mupdf-1.9.patch
new file mode 100644
index 0000000..5686296
--- /dev/null
+++ b/doc/zathura-pdf-mupdf/mupdf-1.9.patch
@@ -0,0 +1,151 @@
+From 368e80b59a7b2f330ad9bd7de45c350c6fbb2209 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail AT eworm.de>
+Date: Mon, 18 Apr 2016 15:23:07 +0200
+Subject: [PATCH 1/1] update API for mupdf 1.9
+
+Signed-off-by: Christian Hesse <mail AT eworm.de>
+---
+ AUTHORS | 1 +
+ config.mk | 2 +-
+ document.c | 6 +++---
+ image.c | 2 +-
+ page.c | 8 ++++----
+ plugin.h | 4 ++--
+ search.c | 2 +-
+ utils.c | 2 +-
+ 8 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index f5f8430..371ebf1 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -5,5 +5,6 @@ Sebastian Ramacher <s.ramacher AT gmx.at>
+
+ Other contributors are (in alphabetical order):
+
++Christian Hesse <mail AT eworm.de>
+ Pavel Borzenkov <pavel.borzenkov AT gmail.com>
+ William Skeith <wes AT cs.ccny.cuny.edu>
+diff --git a/config.mk b/config.mk
+index cba8d40..6407ae6 100644
+--- a/config.mk
++++ b/config.mk
+@@ -32,7 +32,7 @@ endif
+ OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto)
+ OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto)
+
+-MUPDF_LIB ?= -lmupdf -lmujs
++MUPDF_LIB ?= -lmupdf -lmupdfthird
+
+ INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC}
+ LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec
-lopenjp2 -ljpeg
+diff --git a/document.c b/document.c
+index 873866c..548f4ff 100644
+--- a/document.c
++++ b/document.c
+@@ -109,12 +109,12 @@ pdf_document_save_as(zathura_document_t* document,
mupdf_document_t*
+ }
+
+ fz_try (mupdf_document->ctx) {
+- /* fz_write_document claims to accepts NULL as third argument but
doesn't.
++ /* pdf_save_document claims to accepts NULL as third argument but
doesn't.
+ * pdf_write_document does not check if the third arguments is NULL for
some
+ * options. */
+
+- fz_write_options opts = { 0 }; /* just use the default options */
+- fz_write_document(mupdf_document->ctx, mupdf_document->document,
(char*) path, &opts);
++ pdf_write_options opts = { 0 }; /* just use the default options */
++ pdf_save_document(mupdf_document->ctx, (pdf_document*)
mupdf_document->document, (char*) path, &opts);
+ } fz_catch (mupdf_document->ctx) {
+ return ZATHURA_ERROR_UNKNOWN;
+ }
+diff --git a/image.c b/image.c
+index 97d4143..8f6912b 100644
+--- a/image.c
++++ b/image.c
+@@ -93,7 +93,7 @@ pdf_page_image_get_cairo(zathura_page_t* page,
mupdf_page_t* mupdf_page,
+ fz_pixmap* pixmap = NULL;
+ cairo_surface_t* surface = NULL;
+
+- pixmap = fz_new_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
++ pixmap = fz_get_pixmap_from_image(mupdf_page->ctx, mupdf_image, 0, 0);
+ if (pixmap == NULL) {
+ goto error_free;
+ }
+diff --git a/page.c b/page.c
+index beb0351..219fc2a 100644
+--- a/page.c
++++ b/page.c
+@@ -43,12 +43,12 @@ pdf_page_init(zathura_page_t* page)
+ /* setup text */
+ mupdf_page->extracted_text = false;
+
+- mupdf_page->text = fz_new_text_page(mupdf_page->ctx);
++ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx);
+ if (mupdf_page->text == NULL) {
+ goto error_free;
+ }
+
+- mupdf_page->sheet = fz_new_text_sheet(mupdf_page->ctx);
++ mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx);
+ if (mupdf_page->sheet == NULL) {
+ goto error_free;
+ }
+@@ -74,11 +74,11 @@ pdf_page_clear(zathura_page_t* page, mupdf_page_t*
mupdf_page)
+
+ if (mupdf_page != NULL) {
+ if (mupdf_page->text != NULL) {
+- fz_drop_text_page(mupdf_page->ctx, mupdf_page->text);
++ fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text);
+ }
+
+ if (mupdf_page->sheet != NULL) {
+- fz_drop_text_sheet(mupdf_page->ctx, mupdf_page->sheet);
++ fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet);
+ }
+
+ if (mupdf_page->page != NULL) {
+diff --git a/plugin.h b/plugin.h
+index f2fb4a0..84c5e53 100644
+--- a/plugin.h
++++ b/plugin.h
+@@ -21,8 +21,8 @@ typedef struct mupdf_page_s
+ {
+ fz_page* page; /**< Reference to the mupdf page */
+ fz_context* ctx; /**< Context */
+- fz_text_sheet* sheet; /**< Text sheet */
+- fz_text_page* text; /**< Page text */
++ fz_stext_sheet* sheet; /**< Text sheet */
++ fz_stext_page* text; /**< Page text */
+ fz_rect bbox; /**< Bbox */
+ bool extracted_text; /**< If text has already been extracted */
+ } mupdf_page_t;
+diff --git a/search.c b/search.c
+index 3a9fad4..c672b9f 100644
+--- a/search.c
++++ b/search.c
+@@ -40,7 +40,7 @@ pdf_page_search_text(zathura_page_t* page, mupdf_page_t*
mupdf_page, const char*
+ }
+
+ fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS,
sizeof(fz_rect));
+- int num_results = fz_search_text_page(mupdf_page->ctx, mupdf_page->text,
++ int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
+ (char*) text, hit_bbox, N_SEARCH_RESULTS);
+
+ for (int i = 0; i < num_results; i++) {
+diff --git a/utils.c b/utils.c
+index 4a003b9..a4b9320 100644
+--- a/utils.c
++++ b/utils.c
+@@ -14,7 +14,7 @@ mupdf_page_extract_text(mupdf_document_t* mupdf_document,
mupdf_page_t* mupdf_pa
+ fz_device* text_device = NULL;
+
+ fz_try (mupdf_page->ctx) {
+- text_device = fz_new_text_device(mupdf_page->ctx, mupdf_page->sheet,
mupdf_page->text);
++ text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet,
mupdf_page->text);
+
+ /* Disable FZ_IGNORE_IMAGE to collect image blocks */
+ fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);
+--
+2.8.0
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ef27fdfc3eba53803d6346c70ae2d00aa72a9fe9), Vlad Glagolev, 09/29/2016

Archive powered by MHonArc 2.6.24.

Top of Page