Skip to Content.
Sympa Menu

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

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 (0a63848b21e9255cebbe10b8429d57e55c51598a)
  • Date: Sun, 7 Oct 2018 19:26:01 +0000

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

doc/zathura-pdf-mupdf/DETAILS | 4
doc/zathura-pdf-mupdf/HISTORY | 4
doc/zathura-pdf-mupdf/PRE_BUILD | 7 -
doc/zathura-pdf-mupdf/patches/mupdf-1.14.0.patch | 130
-----------------------
doc/zathura/DETAILS | 4
doc/zathura/HISTORY | 3
libs/girara/DETAILS | 4
libs/girara/HISTORY | 3
8 files changed, 16 insertions(+), 143 deletions(-)

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

doc/zathura-pdf-mupdf: version 0.3.4

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

doc/zathura: version 0.4.1

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

libs/girara: version 0.3.1

diff --git a/doc/zathura-pdf-mupdf/DETAILS b/doc/zathura-pdf-mupdf/DETAILS
index 497e264..598f545 100755
--- a/doc/zathura-pdf-mupdf/DETAILS
+++ b/doc/zathura-pdf-mupdf/DETAILS
@@ -1,10 +1,10 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=zathura-pdf-mupdf
- VERSION=0.3.3
+ VERSION=0.3.4
+
SOURCE_HASH=sha256:d64331b9be43e42dce1d113746c62e4e6e9c9a2b4df77889e4bfc743be2dcd98:UPSTREAM_HASH
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha256:52b02ceee272a47f7ef9c2b73cc4f6fb480c02fdce0e7f6b7c8e93ad6ac46dfd: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 190cf40..9f8119d 100644
--- a/doc/zathura-pdf-mupdf/HISTORY
+++ b/doc/zathura-pdf-mupdf/HISTORY
@@ -1,4 +1,8 @@
2018-10-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.3.4
+ * PRE_BUILD, patches/mupdf-1.14.0.patch: removed, fixed by upstream
+
+2018-10-07 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, patches/mupdf-1.14.0.patch: added to adapt for
mupdf 1.14.x

diff --git a/doc/zathura-pdf-mupdf/PRE_BUILD b/doc/zathura-pdf-mupdf/PRE_BUILD
deleted file mode 100755
index e0f8c22..0000000
--- a/doc/zathura-pdf-mupdf/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-# patch if mupdf >= 1.14.x
-if spell_ok mupdf && is_version_less "1.13.0" "$(installed_version mupdf)";
then
- apply_patch_dir patches
-fi
diff --git a/doc/zathura-pdf-mupdf/patches/mupdf-1.14.0.patch
b/doc/zathura-pdf-mupdf/patches/mupdf-1.14.0.patch
deleted file mode 100644
index cf34b63..0000000
--- a/doc/zathura-pdf-mupdf/patches/mupdf-1.14.0.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/meson.build b/meson.build
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,7 @@
- glib = dependency('glib-2.0')
- cairo = dependency('cairo')
- mupdf = cc.find_library('mupdf')
--mupdfthird = cc.find_library('mupdfthird')
-+mupdfthird = cc.find_library('mupdf-third')
-
- build_dependencies = [zathura, girara, glib, cairo, mupdf, mupdfthird]
-
-diff --git a/zathura-pdf-mupdf/document.c b/zathura-pdf-mupdf/document.c
---- a/zathura-pdf-mupdf/document.c
-+++ b/zathura-pdf-mupdf/document.c
-@@ -138,7 +138,8 @@
-
- fz_try (mupdf_document->ctx) {
- pdf_obj* trailer = pdf_trailer(mupdf_document->ctx, (pdf_document*)
mupdf_document->document);
-- pdf_obj* info_dict = pdf_dict_get(mupdf_document->ctx, trailer,
PDF_NAME_Info);
-+ pdf_obj* info_dict = pdf_dict_get(mupdf_document->ctx, trailer,
-+ pdf_dict_get_key(mupdf_document->ctx,
trailer, PDF_ENUM_NAME_Info));
-
- /* get string values */
- typedef struct info_value_s {
-diff --git a/zathura-pdf-mupdf/page.c b/zathura-pdf-mupdf/page.c
---- a/zathura-pdf-mupdf/page.c
-+++ b/zathura-pdf-mupdf/page.c
-@@ -30,14 +30,13 @@
- goto error_free;
- }
-
-- fz_bound_page(mupdf_document->ctx, (fz_page*) mupdf_page->page,
&mupdf_page->bbox);
-+ mupdf_page->bbox = fz_bound_page(mupdf_document->ctx, (fz_page*)
mupdf_page->page);
-
- /* setup text */
- mupdf_page->extracted_text = false;
-
-- fz_rect mediabox;
-- mupdf_page->text = fz_new_stext_page(mupdf_page->ctx,
-- fz_bound_page(mupdf_page->ctx, mupdf_page->page, &mediabox));
-+ fz_rect mediabox = fz_bound_page(mupdf_page->ctx, mupdf_page->page);
-+ mupdf_page->text = fz_new_stext_page(mupdf_page->ctx, mediabox);
- if (mupdf_page->text == NULL) {
- goto error_free;
- }
-diff --git a/zathura-pdf-mupdf/render.c b/zathura-pdf-mupdf/render.c
---- a/zathura-pdf-mupdf/render.c
-+++ b/zathura-pdf-mupdf/render.c
-@@ -18,13 +18,15 @@
- return ZATHURA_ERROR_UNKNOWN;
- }
-
-- fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx,
NULL);
-+ fz_irect irect = { .x1 = page_width, .y1 = page_height };
-+ fz_rect rect = { .x1 = page_width, .y1 = page_height };
-+
-+ fz_display_list* display_list = fz_new_display_list(mupdf_page->ctx,
rect);
- fz_device* device = fz_new_list_device(mupdf_page->ctx,
display_list);
-
- fz_try (mupdf_document->ctx) {
-- fz_matrix m;
-- fz_scale(&m, scalex, scaley);
-- fz_run_page(mupdf_document->ctx, mupdf_page->page, device, &m, NULL);
-+ fz_matrix m = fz_scale(scalex, scaley);
-+ fz_run_page(mupdf_document->ctx, mupdf_page->page, device, m, NULL);
- } fz_catch (mupdf_document->ctx) {
- return ZATHURA_ERROR_UNKNOWN;
- }
-@@ -32,16 +34,14 @@
- fz_close_device(mupdf_page->ctx, device);
- fz_drop_device(mupdf_page->ctx, device);
-
-- fz_irect irect = { .x1 = page_width, .y1 = page_height };
-- fz_rect rect = { .x1 = page_width, .y1 = page_height };
-
- fz_colorspace* colorspace = fz_device_bgr(mupdf_document->ctx);
- 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_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);
-- fz_run_display_list(mupdf_page->ctx, display_list, device, &fz_identity,
&rect, NULL);
-+ device = fz_new_draw_device(mupdf_page->ctx, fz_identity, pixmap);
-+ fz_run_display_list(mupdf_page->ctx, display_list, device, fz_identity,
rect, NULL);
- fz_close_device(mupdf_page->ctx, device);
- fz_drop_device(mupdf_page->ctx, device);
-
-diff --git a/zathura-pdf-mupdf/search.c b/zathura-pdf-mupdf/search.c
---- a/zathura-pdf-mupdf/search.c
-+++ b/zathura-pdf-mupdf/search.c
-@@ -39,17 +39,17 @@
- mupdf_page_extract_text(mupdf_document, mupdf_page);
- }
-
-- fz_rect* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS,
sizeof(fz_rect));
-+ fz_quad* hit_bbox = fz_malloc_array(mupdf_page->ctx, N_SEARCH_RESULTS,
sizeof(fz_quad));
- int num_results = fz_search_stext_page(mupdf_page->ctx, mupdf_page->text,
- text, hit_bbox, N_SEARCH_RESULTS);
-
- for (int i = 0; i < num_results; i++) {
- zathura_rectangle_t* rectangle = g_malloc0(sizeof(zathura_rectangle_t));
-
-- rectangle->x1 = hit_bbox[i].x0;
-- rectangle->x2 = hit_bbox[i].x1;
-- rectangle->y1 = hit_bbox[i].y0;
-- rectangle->y2 = hit_bbox[i].y1;
-+ rectangle->x1 = hit_bbox[i].ul.x;
-+ rectangle->x2 = hit_bbox[i].lr.x;
-+ rectangle->y1 = hit_bbox[i].ul.y;
-+ rectangle->y2 = hit_bbox[i].lr.y;
-
- girara_list_append(list, rectangle);
- }
-diff --git a/zathura-pdf-mupdf/utils.c b/zathura-pdf-mupdf/utils.c
---- a/zathura-pdf-mupdf/utils.c
-+++ b/zathura-pdf-mupdf/utils.c
-@@ -17,9 +17,8 @@
- /* Disable FZ_DONT_INTERPOLATE_IMAGES to collect image blocks */
- fz_disable_device_hints(mupdf_page->ctx, text_device,
FZ_DONT_INTERPOLATE_IMAGES);
-
-- fz_matrix ctm;
-- fz_scale(&ctm, 1.0, 1.0);
-- fz_run_page(mupdf_page->ctx, mupdf_page->page, text_device, &ctm, NULL);
-+ fz_matrix ctm = fz_scale(1.0, 1.0);
-+ fz_run_page(mupdf_page->ctx, mupdf_page->page, text_device, ctm, NULL);
- } fz_always (mupdf_document->ctx) {
- fz_close_device(mupdf_page->ctx, text_device);
- fz_drop_device(mupdf_page->ctx, text_device);
diff --git a/doc/zathura/DETAILS b/doc/zathura/DETAILS
index c168ed9..83cb28f 100755
--- a/doc/zathura/DETAILS
+++ b/doc/zathura/DETAILS
@@ -1,10 +1,10 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=zathura
- VERSION=0.4.0
+ VERSION=0.4.1
+
SOURCE_HASH=sha256:d6f56bf6e7e05d2e91213287c7aea21481c44521b622f9e9ec06a886f51dd9fe:UPSTREAM_HASH
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
-
SOURCE_HASH=sha256:aa629259c6ac729e90abdda1b9b51854adaa6851192f08a55e63379500541ec8: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 25f2f37..6620636 100644
--- a/doc/zathura/HISTORY
+++ b/doc/zathura/HISTORY
@@ -1,3 +1,6 @@
+2018-10-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.4.1
+
2018-05-31 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.4.0, converted to meson build system,
.gz -> .xz, sha1 -> sha256
diff --git a/libs/girara/DETAILS b/libs/girara/DETAILS
index 1d58180..32ea1d6 100755
--- a/libs/girara/DETAILS
+++ b/libs/girara/DETAILS
@@ -1,10 +1,10 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=girara
- VERSION=0.3.0
+ VERSION=0.3.1
+
SOURCE_HASH=sha256:3c409bac00b6628aa80c601a64e11c3ff07a3c0721ac80436eceb282cb55bcb5:UPSTREAM_HASH
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
-
SOURCE_HASH=sha256:b752fa5ff0a98cfa773bbcf66bb8a5e337a61cbb085d6577b3979178d17e41a2: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 6a42742..c1b9fa0 100644
--- a/libs/girara/HISTORY
+++ b/libs/girara/HISTORY
@@ -1,3 +1,6 @@
+2018-10-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 0.3.1
+
2018-05-31 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.3.0, converted to meson build system,
.gz -> .xz, sha1 -> sha256



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0a63848b21e9255cebbe10b8429d57e55c51598a), Pavel Vinogradov, 10/07/2018

Archive powered by MHonArc 2.6.24.

Top of Page