Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a969b542e98b5422e195ebdd57e3862d2b633989)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a969b542e98b5422e195ebdd57e3862d2b633989)
  • Date: Thu, 21 Dec 2017 21:45:47 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

doc/zathura-djvu/DETAILS | 4
doc/zathura-djvu/HISTORY | 3
doc/zathura-pdf-mupdf/0001-Fixed-for-MuPDF-1.12.0.patch | 160
----------------
doc/zathura-pdf-mupdf/DETAILS | 4
doc/zathura-pdf-mupdf/HISTORY | 5
doc/zathura-pdf-mupdf/PRE_BUILD | 2
doc/zathura-pdf-poppler/DETAILS | 4
doc/zathura-pdf-poppler/HISTORY | 3
doc/zathura-ps/DETAILS | 4
doc/zathura-ps/HISTORY | 3
doc/zathura/DETAILS | 4
doc/zathura/HISTORY | 3
libs/girara/DETAILS | 4
libs/girara/HISTORY | 3
14 files changed, 32 insertions(+), 174 deletions(-)

New commits:
commit a969b542e98b5422e195ebdd57e3862d2b633989
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/zathura-djvu: version 0.2.7

commit 816109e481d309acd04c6d28043d341cfbc9ac34
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/zathura-pdf-mupdf: version 0.3.2

commit 6574054762226098d8d008912305978bd9b40692
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/zathura-pdf-poppler: version 0.2.8

commit f5a032c08280cb0b21bd2539ae3e167af4be0bc4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/zathura-ps: version 0.2.5

commit 1e873a24744c221ae869e11aad9bb153f3b90aa5
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

doc/zathura: version 0.3.8

commit 043300ed401f861b6312036b3cdfd4352bba68c7
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/girara: version 0.2.8

diff --git a/doc/zathura-djvu/DETAILS b/doc/zathura-djvu/DETAILS
index 943e681..9892265 100755
--- a/doc/zathura-djvu/DETAILS
+++ b/doc/zathura-djvu/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-djvu
- VERSION=0.2.6
+ VERSION=0.2.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:8fd8ff2ac19d1deea90b737f2bd8b6de415ff502:UPSTREAM_HASH
+ SOURCE_HASH=sha1:90f39016a5de8623ea5e31aa56ed7c38a2f11919:UPSTREAM_HASH
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://pwmt.org/projects/zathura-djvu/
ENTERED=20151107
diff --git a/doc/zathura-djvu/HISTORY b/doc/zathura-djvu/HISTORY
index 7ee64bf..e253b4c 100644
--- a/doc/zathura-djvu/HISTORY
+++ b/doc/zathura-djvu/HISTORY
@@ -1,3 +1,6 @@
+2017-12-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.2.7
+
2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.6

diff --git a/doc/zathura-pdf-mupdf/0001-Fixed-for-MuPDF-1.12.0.patch
b/doc/zathura-pdf-mupdf/0001-Fixed-for-MuPDF-1.12.0.patch
deleted file mode 100644
index 07e3667..0000000
--- a/doc/zathura-pdf-mupdf/0001-Fixed-for-MuPDF-1.12.0.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From b5126af397c6f81be8d29f24d83c37ae5b9eb486 Mon Sep 17 00:00:00 2001
-From: Pavel Vinogradov <public AT sourcemage.org>
-Date: Thu, 14 Dec 2017 01:06:52 -0500
-Subject: [PATCH] Fixed for MuPDF 1.12.0
-
----
- image.c | 18 ++++++++----------
- page.c | 9 ---------
- plugin.h | 3 ++-
- render.c | 4 +++-
- select.c | 5 +++--
- utils.c | 6 +++---
- 6 files changed, 19 insertions(+), 26 deletions(-)
-
-diff --git a/image.c b/image.c
-index b938e5c..3de01ba 100644
---- a/image.c
-+++ b/image.c
-@@ -43,18 +43,16 @@ pdf_page_images_get(zathura_page_t* page, mupdf_page_t*
mupdf_page, zathura_erro
- /* Extract images */
- mupdf_page_extract_text(mupdf_document, mupdf_page);
-
-- fz_page_block* block;
-- for (block = mupdf_page->text->blocks; block < mupdf_page->text->blocks +
mupdf_page->text->len; block++) {
-- if (block->type == FZ_PAGE_BLOCK_IMAGE) {
-- fz_image_block *image_block = block->u.image;
--
-+ fz_stext_block* block;
-+ for (block = mupdf_page->text->first_block; block; block = block->next) {
-+ if (block->type == FZ_STEXT_BLOCK_IMAGE) {
- zathura_image_t* zathura_image = g_malloc(sizeof(zathura_image_t));
-
-- zathura_image->position.x1 = image_block->bbox.x0;
-- zathura_image->position.y1 = image_block->bbox.y0;
-- zathura_image->position.x2 = image_block->bbox.x1;
-- zathura_image->position.y2 = image_block->bbox.y1;
-- zathura_image->data = image_block->image;
-+ zathura_image->position.x1 = block->bbox.x0;
-+ zathura_image->position.y1 = block->bbox.y0;
-+ zathura_image->position.x2 = block->bbox.x1;
-+ zathura_image->position.y2 = block->bbox.y1;
-+ zathura_image->data = block->u.i.image;
-
- girara_list_append(list, zathura_image);
- }
-diff --git a/page.c b/page.c
-index 5302cb5..bb93e09 100644
---- a/page.c
-+++ b/page.c
-@@ -50,11 +50,6 @@ pdf_page_init(zathura_page_t* page)
- goto error_free;
- }
-
-- mupdf_page->sheet = fz_new_stext_sheet(mupdf_page->ctx);
-- if (mupdf_page->sheet == NULL) {
-- goto error_free;
-- }
--
- return ZATHURA_ERROR_OK;
-
- error_free:
-@@ -79,10 +74,6 @@ pdf_page_clear(zathura_page_t* page, mupdf_page_t*
mupdf_page)
- fz_drop_stext_page(mupdf_page->ctx, mupdf_page->text);
- }
-
-- if (mupdf_page->sheet != NULL) {
-- fz_drop_stext_sheet(mupdf_page->ctx, mupdf_page->sheet);
-- }
--
- if (mupdf_page->page != NULL) {
- fz_drop_page(mupdf_document->ctx, mupdf_page->page);
- }
-diff --git a/plugin.h b/plugin.h
-index 84c5e53..e44778b 100644
---- a/plugin.h
-+++ b/plugin.h
-@@ -3,6 +3,8 @@
- #ifndef PDF_H
- #define PDF_H
-
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdbool.h>
- #include <zathura/plugin-api.h>
- #include <mupdf/fitz.h>
-@@ -21,7 +23,6 @@ typedef struct mupdf_page_s
- {
- fz_page* page; /**< Reference to the mupdf page */
- fz_context* ctx; /**< Context */
-- 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 */
-diff --git a/render.c b/render.c
-index 00adb83..b2fb0f8 100644
---- a/render.c
-+++ b/render.c
-@@ -37,7 +37,8 @@ pdf_page_render_to_buffer(mupdf_document_t*
mupdf_document, mupdf_page_t* mupdf_
- fz_rect rect = { .x1 = page_width, .y1 = page_height };
-
- fz_colorspace* colorspace = fz_device_bgr(mupdf_document->ctx);
-- fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx,
colorspace, &irect, 1, image);
-+ fz_separations* seps= fz_page_separations(mupdf_page->ctx,
mupdf_page->page);
-+ fz_pixmap* pixmap = fz_new_pixmap_with_bbox_and_data(mupdf_page->ctx,
colorspace, &irect, seps, 1, image);
- fz_clear_pixmap_with_value(mupdf_page->ctx, pixmap, 0xFF);
-
- device = fz_new_draw_device(mupdf_page->ctx, NULL, pixmap);
-@@ -46,6 +47,7 @@ pdf_page_render_to_buffer(mupdf_document_t*
mupdf_document, mupdf_page_t* mupdf_
-
- fz_drop_pixmap(mupdf_page->ctx, pixmap);
- fz_drop_display_list(mupdf_page->ctx, display_list);
-+ fz_drop_separations(mupdf_page->ctx, seps);
-
- return ZATHURA_ERROR_OK;
- }
-diff --git a/select.c b/select.c
-index c1e1437..fc5d1d8 100644
---- a/select.c
-+++ b/select.c
-@@ -24,9 +24,10 @@ pdf_page_get_text(zathura_page_t* page, mupdf_page_t*
mupdf_page, zathura_rectan
- mupdf_page_extract_text(mupdf_document, mupdf_page);
- }
-
-- fz_rect rect = { rectangle.x1, rectangle.y1, rectangle.x2, rectangle.y2 };
-+ fz_point a = { rectangle.x1, rectangle.y1 };
-+ fz_point b = { rectangle.x2, rectangle.y2 };
-
-- return fz_copy_selection(mupdf_page->ctx, mupdf_page->text, rect);
-+ return fz_copy_selection(mupdf_page->ctx, mupdf_page->text, a, b, 0);
-
- error_ret:
-
-diff --git a/utils.c b/utils.c
-index 5605783..28d519c 100644
---- a/utils.c
-+++ b/utils.c
-@@ -7,17 +7,17 @@
- void
- mupdf_page_extract_text(mupdf_document_t* mupdf_document, mupdf_page_t*
mupdf_page) {
- if (mupdf_document == NULL || mupdf_document->ctx == NULL || mupdf_page
== NULL ||
-- mupdf_page->sheet == NULL || mupdf_page->text == NULL) {
-+ mupdf_page->text == NULL) {
- return;
- }
-
- fz_device* text_device = NULL;
-
- fz_try (mupdf_page->ctx) {
-- text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->sheet,
mupdf_page->text, NULL);
-+ text_device = fz_new_stext_device(mupdf_page->ctx, mupdf_page->text,
NULL);
-
- /* Disable FZ_IGNORE_IMAGE to collect image blocks */
-- fz_disable_device_hints(mupdf_page->ctx, text_device, FZ_IGNORE_IMAGE);
-+ fz_disable_device_hints(mupdf_page->ctx, text_device,
FZ_DONT_INTERPOLATE_IMAGES);
-
- fz_matrix ctm;
- fz_scale(&ctm, 1.0, 1.0);
---
-2.15.1
-
diff --git a/doc/zathura-pdf-mupdf/DETAILS b/doc/zathura-pdf-mupdf/DETAILS
index 6ffae05..448c21d 100755
--- a/doc/zathura-pdf-mupdf/DETAILS
+++ b/doc/zathura-pdf-mupdf/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-pdf-mupdf
- VERSION=0.3.1
+ VERSION=0.3.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:ef37a181de96d6fca36db3ac818f790dcf3627ae:UPSTREAM_HASH
+ SOURCE_HASH=sha1:b33c7ec1ac3cf2ee575b7cc1eae611f00b9ba8d7:UPSTREAM_HASH
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://pwmt.org/projects/zathura-pdf-mupdf/
ENTERED=20160929
diff --git a/doc/zathura-pdf-mupdf/HISTORY b/doc/zathura-pdf-mupdf/HISTORY
index 51a22e1..49949ff 100644
--- a/doc/zathura-pdf-mupdf/HISTORY
+++ b/doc/zathura-pdf-mupdf/HISTORY
@@ -1,3 +1,8 @@
+2017-12-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.3.2
+ * PRE_BUILD, 0001-Fixed-for-MuPDF-1.12.0.patch:
+ removed the patch, fixed in the upstream
+
2017-12-14 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, 0001-Fixed-for-MuPDF-1.12.0.patch:
added a fix for MuPDF 1.12.0
diff --git a/doc/zathura-pdf-mupdf/PRE_BUILD b/doc/zathura-pdf-mupdf/PRE_BUILD
index 38fa746..e463bce 100755
--- a/doc/zathura-pdf-mupdf/PRE_BUILD
+++ b/doc/zathura-pdf-mupdf/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p1 < "${SPELL_DIRECTORY}/0001-Fixed-for-MuPDF-1.12.0.patch" &&
-
if spell_ok openjpeg && is_version_less $(installed_version openjpeg) 2.0;
then
sedit "s:openjp2:openjpeg:" config.mk
fi &&
diff --git a/doc/zathura-pdf-poppler/DETAILS b/doc/zathura-pdf-poppler/DETAILS
index a51b8ac..3bedef1 100755
--- a/doc/zathura-pdf-poppler/DETAILS
+++ b/doc/zathura-pdf-poppler/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-pdf-poppler
- VERSION=0.2.7
+ VERSION=0.2.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:b26fc1eed94bf3119fb7144791b2f5e1ceac40ba:UPSTREAM_HASH
+ SOURCE_HASH=sha1:3baef3a561ab84d6654c35c75aaca7ba17dd5082:UPSTREAM_HASH
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://pwmt.org/projects/zathura-pdf-poppler/
ENTERED=20120309
diff --git a/doc/zathura-pdf-poppler/HISTORY b/doc/zathura-pdf-poppler/HISTORY
index f024140..8f7f080 100644
--- a/doc/zathura-pdf-poppler/HISTORY
+++ b/doc/zathura-pdf-poppler/HISTORY
@@ -1,3 +1,6 @@
+2017-12-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.2.8
+
2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.7

diff --git a/doc/zathura-ps/DETAILS b/doc/zathura-ps/DETAILS
index 80e0caa..feeb19c 100755
--- a/doc/zathura-ps/DETAILS
+++ b/doc/zathura-ps/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-ps
- VERSION=0.2.4
+ VERSION=0.2.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:b1e39928d2f352e0d932dd65ab0a9ba49b664d52:UPSTREAM_HASH
+ SOURCE_HASH=sha1:818c6adc1fba53d4e13921256c135ecd16e28bf0:UPSTREAM_HASH
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://pwmt.org/projects/zathura-ps/
ENTERED=20160930
diff --git a/doc/zathura-ps/HISTORY b/doc/zathura-ps/HISTORY
index 191d546..3046467 100644
--- a/doc/zathura-ps/HISTORY
+++ b/doc/zathura-ps/HISTORY
@@ -1,3 +1,6 @@
+2017-12-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.2.5
+
2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.4

diff --git a/doc/zathura/DETAILS b/doc/zathura/DETAILS
index 4b9d377..87d216f 100755
--- a/doc/zathura/DETAILS
+++ b/doc/zathura/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura
- VERSION=0.3.7
+ VERSION=0.3.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
- SOURCE_HASH=sha1:51935ae1781712b9dc8baed7698c2fa900bcf4fa:UPSTREAM_HASH
+ SOURCE_HASH=sha1:f96df67bd12068af8ed14671877b1ebe64931241:UPSTREAM_HASH
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOC_DIRS=""
WEB_SITE=http://pwmt.org/projects/zathura
diff --git a/doc/zathura/HISTORY b/doc/zathura/HISTORY
index d55cb8b..57a1603 100644
--- a/doc/zathura/HISTORY
+++ b/doc/zathura/HISTORY
@@ -1,3 +1,6 @@
+2017-12-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.3.8
+
2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.3.7

diff --git a/libs/girara/DETAILS b/libs/girara/DETAILS
index a6486fe..ca0190d 100755
--- a/libs/girara/DETAILS
+++ b/libs/girara/DETAILS
@@ -1,9 +1,9 @@
SPELL=girara
- VERSION=0.2.7
+ VERSION=0.2.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:d868a6fc55a155cc043e17e5da31b8440e7babf0:UPSTREAM_HASH
+ SOURCE_HASH=sha1:fa7fddfb5fe2592252ca7253b69be4eb0706438a:UPSTREAM_HASH
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
DOC_DIRS=""
WEB_SITE=https://pwmt.org/projects/girara/
diff --git a/libs/girara/HISTORY b/libs/girara/HISTORY
index ef843df..e5c3eff 100644
--- a/libs/girara/HISTORY
+++ b/libs/girara/HISTORY
@@ -1,3 +1,6 @@
+2017-12-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.2.8
+
2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.7
* BUILD: removed temporary fix -- fixed by upstream



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (a969b542e98b5422e195ebdd57e3862d2b633989), Pavel Vinogradov, 12/21/2017

Archive powered by MHonArc 2.6.24.

Top of Page