Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f58ce925e4dde2a27da994a61924547968c101fb)

Chronological Thread  
    < 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 (f58ce925e4dde2a27da994a61924547968c101fb)
  • Date: Thu, 12 Jan 2017 17:02:08 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

doc/mupdf/DETAILS | 4
doc/mupdf/HISTORY | 10 +
doc/mupdf/PRE_BUILD | 16 +-
doc/mupdf/linebreak.patch | 10 -
doc/mupdf/mupdf-1.10a-shared_libs-1.patch | 40 ++++++
doc/mupdf/mupdf-1.9-upstream_fix-1.patch | 28 ----
doc/mupdf/openjpeg-1.5.patch | 187
------------------------------
doc/mupdf/openjpeg-2.1.patch | 37 -----
doc/mupdf/opj_malloc.patch | 10 +
doc/zathura-djvu/DETAILS | 4
doc/zathura-djvu/HISTORY | 3
doc/zathura-pdf-mupdf/DETAILS | 4
doc/zathura-pdf-mupdf/HISTORY | 4
doc/zathura-pdf-mupdf/PRE_BUILD | 2
doc/zathura-pdf-mupdf/mupdf-1.9.patch | 151 ------------------------
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/BUILD | 3
libs/girara/DETAILS | 5
libs/girara/HISTORY | 4
24 files changed, 102 insertions(+), 441 deletions(-)

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

zathura-ps: => 0.2.4

commit b8ec4419e534b107b7b93e7c8ac93cafa65cf2ec
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zathura-pdf-poppler: => 0.2.7

commit dc550a91f198a41836b332188bba9ed3fc9462eb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zathura-pdf-mupdf: => 0.3.1

commit d3e29cea6db93b8ca016d8932759d7379a18c2ff
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zathura-djvu: => 0.2.6

commit b5ce2ef9ebb233a8a684e4f00a4bd4eb9b43564a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

zathura: => 0.3.7

commit e3a3bd84cceed1cfa457cb7c2c498d8ce39fd6d2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mupdf: => 1.10a

commit a5671515f8521304c7ab264bffea4e2cffe1bfb1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

girara: => 0.2.7

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 8be6003..6ace5ec 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
SPELL=mupdf
- VERSION=1.9a
+ VERSION=1.10a
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.gz
SOURCE_URL[0]=http://mupdf.com/downloads/$SOURCE
SOURCE_URL[1]=http://mupdf.com/downloads/archive/$SOURCE
-
SOURCE_HASH=sha512:9f804fd65c2dc6b7a3bd73961b1f1a8bf93d52903cccf6302acd6982dfa433125a3b8e77b808984921aee097877280fa21aafb87468cd0a8e4cfa900284a262b
+
SOURCE_HASH=sha512:8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-source"
WEB_SITE=http://www.mupdf.com/
ENTERED=20120426
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 52a76ea..8a66379 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,13 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.10a
+ * PRE_BUILD: use shipped openjpeg library if we have old system one
+ * mupdf-1.10a-shared_libs-1.patch: added, to build shared libraries,
+ imported from BLFS
+ * opj_malloc.patch: added, to fix build with internal openjpeg library
+ * linebreak.patch, mupdf-1.9-upstream_fix-1.patch, openjpeg-2.1.patch:
+ dropped, fixed by upstream
+ * openjpeg-1.5.patch: dropped, replaced by internal library
+
2016-10-01 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGERS: added, to rebuild spells depending on mupdf static libs

diff --git a/doc/mupdf/PRE_BUILD b/doc/mupdf/PRE_BUILD
index 216359b..513af7c 100755
--- a/doc/mupdf/PRE_BUILD
+++ b/doc/mupdf/PRE_BUILD
@@ -1,15 +1,15 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-rm -rf thirdparty/{curl,freetype,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} &&
+sedit "/OPJ_STATIC$/d" source/fitz/load-jpx.c &&
+sedit "s:-DOPJ_STATIC::" Makethird &&
+patch -p1 < "${SPELL_DIRECTORY}/mupdf-1.10a-shared_libs-1.patch" &&

-patch -p1 < "${SPELL_DIRECTORY}/mupdf-1.9-upstream_fix-1.patch" &&
-patch -p0 < "${SPELL_DIRECTORY}/linebreak.patch" &&
+rm -rf thirdparty/{curl,freetype,harfbuzz,glfw,jbig2dec,jpeg,zlib} &&

-if spell_ok openjpeg && is_version_less $(installed_version openjpeg) 2.0;
then
- patch -p0 < "${SPELL_DIRECTORY}/openjpeg-1.5.patch" &&
-
- sedit "s:libopenjp2:libopenjpeg:g" Makerules
+# building against older system OpenJPEG library is unsupported
+if spell_ok openjpeg && ! is_version_less $(installed_version openjpeg) 2.0;
then
+ rm -rf thirdparty/openjpeg
else
- patch -p1 < "${SPELL_DIRECTORY}/openjpeg-2.1.patch"
+ patch -p0 < "${SPELL_DIRECTORY}/opj_malloc.patch"
fi
diff --git a/doc/mupdf/linebreak.patch b/doc/mupdf/linebreak.patch
deleted file mode 100644
index 603c2ab..0000000
--- a/doc/mupdf/linebreak.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/html/html-layout.c.orig 2016-04-21 07:14:32.000000000 -0400
-+++ source/html/html-layout.c 2016-09-30 12:05:50.251503828 -0400
-@@ -2094,6 +2094,7 @@
- g.base_uri = base_uri;
- g.at_bol = 0;
- g.emit_white = 0;
-+ g.last_brk_cls = UCDN_LINEBREAK_CLASS_OP;
-
- xml = fz_parse_xml(ctx, buf->data, buf->len, 1);
-
diff --git a/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
b/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
new file mode 100644
index 0000000..14b7d3d
--- /dev/null
+++ b/doc/mupdf/mupdf-1.10a-shared_libs-1.patch
@@ -0,0 +1,40 @@
+Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date: 2016-11-27
+Initial Package Version: 1.10
+Upstream Status: N/A
+Origin: Armin K and Gentoo
+Description: Generate shared libraries for mupdf, instead of static ones.
This
+ allows to have the font information (around 35 MB) at one place
+ only, instead of in all the executables.
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile 2016-11-21 11:21:11.000000000 +0100
++++ b/Makefile 2016-11-27 10:26:11.411353082 +0100
+@@ -15,7 +15,7 @@
+ # Do not specify CFLAGS or LIBS on the make invocation line - specify
+ # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
+ # set a variable that was set on the command line.
+-CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN)
++CFLAGS += $(XCFLAGS) -Iinclude -I$(GEN) -fPIC
+ LIBS += $(XLIBS) -lm
+
+ LIBS += $(FREETYPE_LIBS)
+@@ -152,14 +152,16 @@
+
+ # --- Library ---
+
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdfthird.a
++MUPDF_LIB = $(OUT)/libmupdf.so
++THIRD_LIB = $(OUT)/libmupdfthird.so
+
+ MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ)
$(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
+ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ)
$(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
+
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
+ $(THIRD_LIB) : $(THIRD_OBJ)
++ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so
-Wl,--no-undefined
+
+ INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
+
diff --git a/doc/mupdf/mupdf-1.9-upstream_fix-1.patch
b/doc/mupdf/mupdf-1.9-upstream_fix-1.patch
deleted file mode 100644
index 666d891..0000000
--- a/doc/mupdf/mupdf-1.9-upstream_fix-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2016-08-30
-Initial Package Version: 1.9 (possibly applies to 1.5 and 1.7 versions)
-Upstream Status: Applied
-Origin: Upstream
-Description: Fixes use after free, upstream bug 696941, CVE-2016-6265.
-
-diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
-index 576c315..3222599 100644
---- a/source/pdf/pdf-xref.c
-+++ b/source/pdf/pdf-xref.c
-@@ -1184,8 +1184,14 @@ pdf_load_xref(fz_context *ctx, pdf_document *doc,
pdf_lexbuf *buf)
- fz_throw(ctx, FZ_ERROR_GENERIC, "object
offset out of range: %d (%d 0 R)", (int)entry->ofs, i);
- }
- if (entry->type == 'o')
-- if (entry->ofs <= 0 || entry->ofs >= xref_len ||
pdf_get_xref_entry(ctx, doc, entry->ofs)->type != 'n')
-- fz_throw(ctx, FZ_ERROR_GENERIC, "invalid
reference to an objstm that does not exist: %d (%d 0 R)", (int)entry->ofs, i);
-+ {
-+ /* Read this into a local variable here, because
pdf_get_xref_entry
-+ * may solidify the xref, hence invalidating "entry",
meaning we
-+ * need a stashed value for the throw. */
-+ fz_off_t ofs = entry->ofs;
-+ if (ofs <= 0 || ofs >= xref_len ||
pdf_get_xref_entry(ctx, doc, ofs)->type != 'n')
-+ fz_throw(ctx, FZ_ERROR_GENERIC, "invalid
reference to an objstm that does not exist: %d (%d 0 R)", (int)ofs, i);
-+ }
- }
- }
-
diff --git a/doc/mupdf/openjpeg-1.5.patch b/doc/mupdf/openjpeg-1.5.patch
deleted file mode 100644
index bb6f7c0..0000000
--- a/doc/mupdf/openjpeg-1.5.patch
+++ /dev/null
@@ -1,187 +0,0 @@
---- source/fitz/load-jpx.c.orig 2016-04-21 07:14:32.000000000 -0400
-+++ source/fitz/load-jpx.c 2016-09-29 20:52:56.344529197 -0400
-@@ -8,7 +8,7 @@
- #define OPJ_HAVE_STDINT_H
- #endif
-
--#include <openjpeg.h>
-+#include <openjpeg-1.5/openjpeg.h>
-
- static void fz_opj_error_callback(const char *msg, void *client_data)
- {
-@@ -27,119 +27,51 @@
- /* fz_warn("openjpeg info: %s", msg); */
- }
-
--typedef struct stream_block_s
--{
-- unsigned char *data;
-- int size;
-- int pos;
--} stream_block;
--
--static OPJ_SIZE_T fz_opj_stream_read(void * p_buffer, OPJ_SIZE_T
p_nb_bytes, void * p_user_data)
--{
-- stream_block *sb = (stream_block *)p_user_data;
-- int len;
--
-- len = sb->size - sb->pos;
-- if (len < 0)
-- len = 0;
-- if (len == 0)
-- return (OPJ_SIZE_T)-1; /* End of file! */
-- if ((OPJ_SIZE_T)len > p_nb_bytes)
-- len = p_nb_bytes;
-- memcpy(p_buffer, sb->data + sb->pos, len);
-- sb->pos += len;
-- return len;
--}
--
--static OPJ_OFF_T fz_opj_stream_skip(OPJ_OFF_T skip, void * p_user_data)
--{
-- stream_block *sb = (stream_block *)p_user_data;
--
-- if (skip > sb->size - sb->pos)
-- skip = sb->size - sb->pos;
-- sb->pos += skip;
-- return sb->pos;
--}
--
--static OPJ_BOOL fz_opj_stream_seek(OPJ_OFF_T seek_pos, void * p_user_data)
--{
-- stream_block *sb = (stream_block *)p_user_data;
--
-- if (seek_pos > sb->size)
-- return OPJ_FALSE;
-- sb->pos = seek_pos;
-- return OPJ_TRUE;
--}
--
- fz_pixmap *
- fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace
*defcs, int indexed)
- {
- fz_pixmap *img;
-+ fz_colorspace *origcs;
-+ opj_event_mgr_t evtmgr;
- opj_dparameters_t params;
-- opj_codec_t *codec;
-+ opj_dinfo_t *codec;
- opj_image_t *jpx;
-- opj_stream_t *stream;
-+ opj_cio_t *stream;
- fz_colorspace *colorspace;
- unsigned char *p;
- OPJ_CODEC_FORMAT format;
- int a, n, w, h, depth, sgnd;
- int x, y, k, v;
-- stream_block sb;
-
- if (size < 2)
- fz_throw(ctx, FZ_ERROR_GENERIC, "not enough data to determine
image format");
-
- /* Check for SOC marker -- if found we have a bare J2K stream */
- if (data[0] == 0xFF && data[1] == 0x4F)
-- format = OPJ_CODEC_J2K;
-+ format = CODEC_J2K;
- else
-- format = OPJ_CODEC_JP2;
-+ format = CODEC_JP2;
-+
-+ memset(&evtmgr, 0, sizeof(evtmgr));
-+ evtmgr.error_handler = fz_opj_error_callback;
-+ evtmgr.warning_handler = fz_opj_warning_callback;
-+ evtmgr.info_handler = fz_opj_info_callback;
-
- opj_set_default_decoder_parameters(&params);
- if (indexed)
- params.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
-
- codec = opj_create_decompress(format);
-- opj_set_info_handler(codec, fz_opj_info_callback, ctx);
-- opj_set_warning_handler(codec, fz_opj_warning_callback, ctx);
-- opj_set_error_handler(codec, fz_opj_error_callback, ctx);
-- if (!opj_setup_decoder(codec, &params))
-- {
-- opj_destroy_codec(codec);
-- fz_throw(ctx, FZ_ERROR_GENERIC, "j2k decode failed");
-- }
-+ opj_set_event_mgr((opj_common_ptr)codec, &evtmgr, ctx);
-+ opj_setup_decoder(codec, &params);
-
-- stream = opj_stream_default_create(OPJ_TRUE);
-- sb.data = data;
-- sb.pos = 0;
-- sb.size = size;
-+ stream = opj_cio_open((opj_common_ptr)codec, data, size);
-
-- opj_stream_set_read_function(stream, fz_opj_stream_read);
-- opj_stream_set_skip_function(stream, fz_opj_stream_skip);
-- opj_stream_set_seek_function(stream, fz_opj_stream_seek);
-- opj_stream_set_user_data(stream, &sb);
-- /* Set the length to avoid an assert */
-- opj_stream_set_user_data_length(stream, size);
-+ jpx = opj_decode(codec, stream);
-
-- if (!opj_read_header(stream, codec, &jpx))
-- {
-- opj_stream_destroy(stream);
-- opj_destroy_codec(codec);
-- fz_throw(ctx, FZ_ERROR_GENERIC, "Failed to read JPX header");
-- }
-+ opj_cio_close(stream);
-+ opj_destroy_decompress(codec);
-
-- if (!opj_decode(codec, stream, jpx))
-- {
-- opj_stream_destroy(stream);
-- opj_destroy_codec(codec);
-- opj_image_destroy(jpx);
-- fz_throw(ctx, FZ_ERROR_GENERIC, "Failed to decode JPX image");
-- }
--
-- opj_stream_destroy(stream);
-- opj_destroy_codec(codec);
--
-- /* jpx should never be NULL here, but check anyway */
- if (!jpx)
- fz_throw(ctx, FZ_ERROR_GENERIC, "opj_decode failed");
-
-@@ -173,12 +105,13 @@
- depth = jpx->comps[0].prec;
- sgnd = jpx->comps[0].sgnd;
-
-- if (jpx->color_space == OPJ_CLRSPC_SRGB && n == 4) { n = 3; a = 1; }
-- else if (jpx->color_space == OPJ_CLRSPC_SYCC && n == 4) { n = 3; a =
1; }
-+ if (jpx->color_space == CLRSPC_SRGB && n == 4) { n = 3; a = 1; }
-+ else if (jpx->color_space == CLRSPC_SYCC && n == 4) { n = 3; a = 1; }
- else if (n == 2) { n = 1; a = 1; }
- else if (n > 4) { n = 4; a = 1; }
- else { a = 0; }
-
-+ origcs = defcs;
- if (defcs)
- {
- if (defcs->n == n)
-@@ -224,8 +157,6 @@
- v = v + (1 << (depth - 1));
- if (depth > 8)
- v = v >> (depth - 8);
-- else if (depth < 8)
-- v = v << (8 - depth);
- *p++ = v;
- }
- if (!a)
-@@ -247,5 +178,13 @@
- fz_premultiply_pixmap(ctx, img);
- }
-
-+ if (origcs != defcs)
-+ {
-+ fz_pixmap *tmp = fz_new_pixmap(ctx, origcs, w, h);
-+ fz_convert_pixmap(ctx, tmp, img);
-+ fz_drop_pixmap(ctx, img);
-+ img = tmp;
-+ }
-+
- return img;
- }
diff --git a/doc/mupdf/openjpeg-2.1.patch b/doc/mupdf/openjpeg-2.1.patch
deleted file mode 100644
index fa9e3dc..0000000
--- a/doc/mupdf/openjpeg-2.1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -3,12 +3,17 @@
- /* Without the definition of OPJ_STATIC, compilation fails on windows
- * due to the use of __stdcall. We believe it is required on some
- * linux toolchains too. */
-+
-+#ifdef __cplusplus
-+extern "C"
-+{
- #define OPJ_STATIC
- #ifndef _MSC_VER
- #define OPJ_HAVE_STDINT_H
- #endif
-+#endif
-
--#include <openjpeg.h>
-+#include <openjpeg-2.1/openjpeg.h>
-
- static void fz_opj_error_callback(const char *msg, void *client_data)
- {
-@@ -117,7 +122,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch
- opj_stream_set_read_function(stream, fz_opj_stream_read);
- opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- opj_stream_set_seek_function(stream, fz_opj_stream_seek);
-- opj_stream_set_user_data(stream, &sb);
-+ opj_stream_set_user_data(stream, &sb, NULL);
- /* Set the length to avoid an assert */
- opj_stream_set_user_data_length(stream, size);
-
-@@ -247,3 +252,6 @@ fz_load_jpx(fz_context *ctx, unsigned ch
-
- return img;
- }
-+#ifdef __cplusplus
-+}
-+#endif
diff --git a/doc/mupdf/opj_malloc.patch b/doc/mupdf/opj_malloc.patch
new file mode 100644
index 0000000..cad9464
--- /dev/null
+++ b/doc/mupdf/opj_malloc.patch
@@ -0,0 +1,10 @@
+--- Makethird.orig 2016-11-28 08:34:04.000000000 -0500
++++ Makethird 2017-01-12 11:32:10.446728841 -0500
+@@ -387,6 +387,7 @@
+ mct.c \
+ mqc.c \
+ openjpeg.c \
++ opj_malloc.c \
+ phix_manager.c \
+ pi.c \
+ ppix_manager.c \
diff --git a/doc/zathura-djvu/DETAILS b/doc/zathura-djvu/DETAILS
index 2ae036a..943e681 100755
--- a/doc/zathura-djvu/DETAILS
+++ b/doc/zathura-djvu/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-djvu
- VERSION=0.2.5
+ VERSION=0.2.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:9808c2f4c4dc025d10d3285db507cd79df721514:UPSTREAM_HASH
+ SOURCE_HASH=sha1:8fd8ff2ac19d1deea90b737f2bd8b6de415ff502: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 e9895c0..7ee64bf 100644
--- a/doc/zathura-djvu/HISTORY
+++ b/doc/zathura-djvu/HISTORY
@@ -1,3 +1,6 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.6
+
2016-09-07 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to fix build with gcc 4.6

diff --git a/doc/zathura-pdf-mupdf/DETAILS b/doc/zathura-pdf-mupdf/DETAILS
index 517cbdb..6ffae05 100755
--- a/doc/zathura-pdf-mupdf/DETAILS
+++ b/doc/zathura-pdf-mupdf/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-pdf-mupdf
- VERSION=0.3.0
+ VERSION=0.3.1
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_HASH=sha1:ef37a181de96d6fca36db3ac818f790dcf3627ae: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 e398162..cb4a0a3 100644
--- a/doc/zathura-pdf-mupdf/HISTORY
+++ b/doc/zathura-pdf-mupdf/HISTORY
@@ -1,3 +1,7 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.1
+ * mupdf-1.9.patch: dropped, fixed by upstream
+
2016-09-30 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing openjpeg dependency

diff --git a/doc/zathura-pdf-mupdf/PRE_BUILD b/doc/zathura-pdf-mupdf/PRE_BUILD
index 612ae59..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}/mupdf-1.9.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-mupdf/mupdf-1.9.patch
b/doc/zathura-pdf-mupdf/mupdf-1.9.patch
deleted file mode 100644
index 5686296..0000000
--- a/doc/zathura-pdf-mupdf/mupdf-1.9.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-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
-
diff --git a/doc/zathura-pdf-poppler/DETAILS b/doc/zathura-pdf-poppler/DETAILS
index 1a3a53b..a51b8ac 100755
--- a/doc/zathura-pdf-poppler/DETAILS
+++ b/doc/zathura-pdf-poppler/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-pdf-poppler
- 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:5726f9e2688d72dcc2265cb20d9a070849902f77:UPSTREAM_HASH
+ SOURCE_HASH=sha1:b26fc1eed94bf3119fb7144791b2f5e1ceac40ba: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 81f4b5e..f024140 100644
--- a/doc/zathura-pdf-poppler/HISTORY
+++ b/doc/zathura-pdf-poppler/HISTORY
@@ -1,3 +1,6 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.7
+
2016-09-29 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added, conflicts zathura-pdf-mupdf

diff --git a/doc/zathura-ps/DETAILS b/doc/zathura-ps/DETAILS
index 1823aeb..80e0caa 100755
--- a/doc/zathura-ps/DETAILS
+++ b/doc/zathura-ps/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura-ps
- VERSION=0.2.3
+ VERSION=0.2.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS="no-check-certificate"
- SOURCE_HASH=sha1:893f743a5e54b0cdabf30a50451eb3d427831b17:UPSTREAM_HASH
+ SOURCE_HASH=sha1:b1e39928d2f352e0d932dd65ab0a9ba49b664d52: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 c07d08d..191d546 100644
--- a/doc/zathura-ps/HISTORY
+++ b/doc/zathura-ps/HISTORY
@@ -1,2 +1,5 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.4
+
2016-09-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, {PRE,}BUILD, INSTALL: created spell, version 0.2.3
diff --git a/doc/zathura/DETAILS b/doc/zathura/DETAILS
index 73fb6e6..4b9d377 100755
--- a/doc/zathura/DETAILS
+++ b/doc/zathura/DETAILS
@@ -1,9 +1,9 @@
SPELL=zathura
- VERSION=0.3.6
+ VERSION=0.3.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pwmt.org/projects/$SPELL/download/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
- SOURCE_HASH=sha1:db5e76815fdfd0c2d6b5d5c16492995720268440:UPSTREAM_HASH
+ SOURCE_HASH=sha1:51935ae1781712b9dc8baed7698c2fa900bcf4fa: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 3c5b256..d55cb8b 100644
--- a/doc/zathura/HISTORY
+++ b/doc/zathura/HISTORY
@@ -1,3 +1,6 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3.7
+
2016-09-07 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to fix build with gcc 4.6

diff --git a/libs/girara/BUILD b/libs/girara/BUILD
index 07e2295..0f5a31d 100755
--- a/libs/girara/BUILD
+++ b/libs/girara/BUILD
@@ -1,6 +1,3 @@
-# https://bugs.pwmt.org/project/zathura/issue/469
-list_remove CFLAGS "-Os" &&
-
make options &&

OPTS="COLOR=0 VERBOSE=1 $OPTS" &&
diff --git a/libs/girara/DETAILS b/libs/girara/DETAILS
index 9c336c3..a6486fe 100755
--- a/libs/girara/DETAILS
+++ b/libs/girara/DETAILS
@@ -1,10 +1,9 @@
SPELL=girara
- VERSION=0.2.6
- PATCHLEVEL=1
+ 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:674e4294fe091fe93a1c186d95b3263b30cd8a5e:UPSTREAM_HASH
+ SOURCE_HASH=sha1:d868a6fc55a155cc043e17e5da31b8440e7babf0: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 b32bfab..ef843df 100644
--- a/libs/girara/HISTORY
+++ b/libs/girara/HISTORY
@@ -1,3 +1,7 @@
+2017-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.7
+ * BUILD: removed temporary fix -- fixed by upstream
+
2016-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* BUILD: drop '-Os' optimization flag to fix bug #469 at upstream


  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f58ce925e4dde2a27da994a61924547968c101fb), Vlad Glagolev, 01/12/2017

Archive powered by MHonArc 2.6.24.

Top of Page