diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -1,3 +1,4 @@ +libmupdf-pkcs7.so:get_signatory libmupdf-pkcs7.so:pkcs7_openssl_new_verifier libmupdf-pkcs7.so:pkcs7_openssl_read_pfx libmupdf-threads.so:mu_create_mutex @@ -195,6 +196,7 @@ libmupdf.so:_binary_resources_fonts_urw_NimbusSans_Italic_cff_size libmupdf.so:_binary_resources_fonts_urw_NimbusSans_Regular_cff_size libmupdf.so:_binary_resources_fonts_urw_StandardSymbolsPS_cff_size +libmupdf.so:css_property_lookup libmupdf.so:ft_char_index libmupdf.so:ft_error_string libmupdf.so:ft_name_index @@ -340,6 +342,7 @@ libmupdf.so:fz_count_pages libmupdf.so:fz_count_separations libmupdf.so:fz_css_enlist +libmupdf.so:fz_css_property_name libmupdf.so:fz_currentpoint libmupdf.so:fz_curveto libmupdf.so:fz_curvetov @@ -610,6 +613,8 @@ libmupdf.so:fz_list_archive_entry libmupdf.so:fz_load_bmp libmupdf.so:fz_load_bmp_info +libmupdf.so:fz_load_bmp_subimage +libmupdf.so:fz_load_bmp_subimage_count libmupdf.so:fz_load_chapter_page libmupdf.so:fz_load_fallback_font libmupdf.so:fz_load_gif @@ -680,6 +685,7 @@ libmupdf.so:fz_md5_init libmupdf.so:fz_md5_pixmap libmupdf.so:fz_md5_update +libmupdf.so:fz_measure_string libmupdf.so:fz_memmem libmupdf.so:fz_memrnd libmupdf.so:fz_moveto @@ -771,6 +777,7 @@ libmupdf.so:fz_new_log_for_module libmupdf.so:fz_new_mono_pcl_band_writer libmupdf.so:fz_new_mono_pwg_band_writer +libmupdf.so:fz_new_ocr_device libmupdf.so:fz_new_outline libmupdf.so:fz_new_output libmupdf.so:fz_new_output_with_buffer @@ -788,6 +795,9 @@ libmupdf.so:fz_new_pclm_writer_with_output libmupdf.so:fz_new_pdf_writer libmupdf.so:fz_new_pdf_writer_with_output +libmupdf.so:fz_new_pdfocr_band_writer +libmupdf.so:fz_new_pdfocr_writer +libmupdf.so:fz_new_pdfocr_writer_with_output libmupdf.so:fz_new_pgm_pixmap_writer libmupdf.so:fz_new_pixmap libmupdf.so:fz_new_pixmap_from_1bpp_data @@ -844,6 +854,7 @@ libmupdf.so:fz_new_trace_device libmupdf.so:fz_new_type3_font libmupdf.so:fz_new_xhtml_document_from_document +libmupdf.so:fz_new_xmltext_device libmupdf.so:fz_new_zip_writer libmupdf.so:fz_new_zip_writer_with_output libmupdf.so:fz_next_page @@ -911,13 +922,17 @@ libmupdf.so:fz_parse_css libmupdf.so:fz_parse_css_properties libmupdf.so:fz_parse_draw_options -libmupdf.so:fz_parse_html +libmupdf.so:fz_parse_fb2 +libmupdf.so:fz_parse_html5 libmupdf.so:fz_parse_page_range libmupdf.so:fz_parse_pcl_options libmupdf.so:fz_parse_pclm_options +libmupdf.so:fz_parse_pdfocr_options libmupdf.so:fz_parse_pwg_options libmupdf.so:fz_parse_stext_options +libmupdf.so:fz_parse_xhtml libmupdf.so:fz_parse_xml +libmupdf.so:fz_parse_xml_from_html5 libmupdf.so:fz_pcl_preset libmupdf.so:fz_pixmap_alpha libmupdf.so:fz_pixmap_bbox @@ -950,6 +965,7 @@ libmupdf.so:fz_print_stext_header_as_html libmupdf.so:fz_print_stext_header_as_xhtml libmupdf.so:fz_print_stext_page_as_html +libmupdf.so:fz_print_stext_page_as_json libmupdf.so:fz_print_stext_page_as_text libmupdf.so:fz_print_stext_page_as_xhtml libmupdf.so:fz_print_stext_page_as_xml @@ -1034,6 +1050,7 @@ libmupdf.so:fz_save_pixmap_as_pbm libmupdf.so:fz_save_pixmap_as_pcl libmupdf.so:fz_save_pixmap_as_pclm +libmupdf.so:fz_save_pixmap_as_pdfocr libmupdf.so:fz_save_pixmap_as_pkm libmupdf.so:fz_save_pixmap_as_png libmupdf.so:fz_save_pixmap_as_pnm @@ -1158,6 +1175,7 @@ libmupdf.so:fz_vwarn libmupdf.so:fz_walk_path libmupdf.so:fz_warn +libmupdf.so:fz_warp_pixmap libmupdf.so:fz_windows_1250_from_unicode libmupdf.so:fz_windows_1251_from_unicode libmupdf.so:fz_windows_1252_from_unicode @@ -1172,6 +1190,7 @@ libmupdf.so:fz_write_byte libmupdf.so:fz_write_char libmupdf.so:fz_write_data +libmupdf.so:fz_write_document libmupdf.so:fz_write_float_be libmupdf.so:fz_write_float_le libmupdf.so:fz_write_header @@ -1184,6 +1203,7 @@ libmupdf.so:fz_write_pixmap_as_pam libmupdf.so:fz_write_pixmap_as_pcl libmupdf.so:fz_write_pixmap_as_pclm +libmupdf.so:fz_write_pixmap_as_pdfocr libmupdf.so:fz_write_pixmap_as_png libmupdf.so:fz_write_pixmap_as_pnm libmupdf.so:fz_write_pixmap_as_ps @@ -1203,6 +1223,7 @@ libmupdf.so:fz_write_vprintf libmupdf.so:fz_write_zip_entry libmupdf.so:fz_xml_att +libmupdf.so:fz_xml_att_alt libmupdf.so:fz_xml_att_eq libmupdf.so:fz_xml_down libmupdf.so:fz_xml_find @@ -1220,7 +1241,6 @@ libmupdf.so:fz_xml_up libmupdf.so:fz_zlib_alloc libmupdf.so:fz_zlib_free -libmupdf.so:new_draw_device libmupdf.so:opj_aligned_32_malloc libmupdf.so:opj_aligned_free libmupdf.so:opj_aligned_malloc @@ -1261,6 +1281,7 @@ libmupdf.so:pdf_annot_border libmupdf.so:pdf_annot_color libmupdf.so:pdf_annot_contents +libmupdf.so:pdf_annot_creation_date libmupdf.so:pdf_annot_default_appearance libmupdf.so:pdf_annot_event_blur libmupdf.so:pdf_annot_event_down @@ -1295,6 +1316,7 @@ libmupdf.so:pdf_annot_line_start_style libmupdf.so:pdf_annot_modification_date libmupdf.so:pdf_annot_opacity +libmupdf.so:pdf_annot_popup libmupdf.so:pdf_annot_quad_point libmupdf.so:pdf_annot_quad_point_count libmupdf.so:pdf_annot_quadding @@ -1375,6 +1397,7 @@ libmupdf.so:pdf_create_annot_raw libmupdf.so:pdf_create_document libmupdf.so:pdf_create_object +libmupdf.so:pdf_create_signature_widget libmupdf.so:pdf_crypt_encrypt_metadata libmupdf.so:pdf_crypt_key libmupdf.so:pdf_crypt_length @@ -1401,6 +1424,7 @@ libmupdf.so:pdf_dict_dels libmupdf.so:pdf_dict_get libmupdf.so:pdf_dict_get_bool +libmupdf.so:pdf_dict_get_date libmupdf.so:pdf_dict_get_inheritable libmupdf.so:pdf_dict_get_int libmupdf.so:pdf_dict_get_key @@ -1421,6 +1445,7 @@ libmupdf.so:pdf_dict_put libmupdf.so:pdf_dict_put_array libmupdf.so:pdf_dict_put_bool +libmupdf.so:pdf_dict_put_date libmupdf.so:pdf_dict_put_dict libmupdf.so:pdf_dict_put_drop libmupdf.so:pdf_dict_put_int @@ -1509,7 +1534,6 @@ libmupdf.so:pdf_filter_page_contents libmupdf.so:pdf_filter_xobject_instance libmupdf.so:pdf_find_font_resource -libmupdf.so:pdf_find_image_resource libmupdf.so:pdf_find_item libmupdf.so:pdf_find_locked_fields libmupdf.so:pdf_find_locked_fields_for_sig @@ -1520,7 +1544,6 @@ libmupdf.so:pdf_font_cid_to_gid libmupdf.so:pdf_font_writing_supported libmupdf.so:pdf_forget_xref -libmupdf.so:pdf_format_date libmupdf.so:pdf_format_write_options libmupdf.so:pdf_function_size libmupdf.so:pdf_get_bound_document @@ -1530,13 +1553,14 @@ libmupdf.so:pdf_get_widget_editing_state libmupdf.so:pdf_get_xref_entry libmupdf.so:pdf_graft_mapped_object +libmupdf.so:pdf_graft_mapped_page libmupdf.so:pdf_graft_object +libmupdf.so:pdf_graft_page libmupdf.so:pdf_guess_mime_type_from_file_name libmupdf.so:pdf_has_permission libmupdf.so:pdf_has_unsaved_changes libmupdf.so:pdf_has_unsaved_sigs libmupdf.so:pdf_insert_font_resource -libmupdf.so:pdf_insert_image_resource libmupdf.so:pdf_insert_page libmupdf.so:pdf_invalidate_xfa libmupdf.so:pdf_is_array @@ -1642,6 +1666,7 @@ libmupdf.so:pdf_new_buffer_processor libmupdf.so:pdf_new_cmap libmupdf.so:pdf_new_crypt +libmupdf.so:pdf_new_date libmupdf.so:pdf_new_dict libmupdf.so:pdf_new_display_list_from_annot libmupdf.so:pdf_new_encrypt @@ -1742,6 +1767,7 @@ libmupdf.so:pdf_set_annot_border libmupdf.so:pdf_set_annot_color libmupdf.so:pdf_set_annot_contents +libmupdf.so:pdf_set_annot_creation_date libmupdf.so:pdf_set_annot_default_appearance libmupdf.so:pdf_set_annot_flags libmupdf.so:pdf_set_annot_icon_name @@ -1755,6 +1781,7 @@ libmupdf.so:pdf_set_annot_line_start_style libmupdf.so:pdf_set_annot_modification_date libmupdf.so:pdf_set_annot_opacity +libmupdf.so:pdf_set_annot_popup libmupdf.so:pdf_set_annot_quad_points libmupdf.so:pdf_set_annot_quadding libmupdf.so:pdf_set_annot_rect @@ -1798,6 +1825,7 @@ libmupdf.so:pdf_text_widget_format libmupdf.so:pdf_text_widget_max_len libmupdf.so:pdf_to_bool +libmupdf.so:pdf_to_date libmupdf.so:pdf_to_gen libmupdf.so:pdf_to_int libmupdf.so:pdf_to_int64 @@ -1839,6 +1867,7 @@ libmupdf.so:pdf_version libmupdf.so:pdf_walk_tree libmupdf.so:pdf_was_pure_xfa +libmupdf.so:pdf_was_repaired libmupdf.so:pdf_widget_is_signed libmupdf.so:pdf_widget_type libmupdf.so:pdf_write_digest @@ -1864,8 +1893,11 @@ libmupdf.so:svg_parse_color libmupdf.so:svg_parse_color_from_style libmupdf.so:svg_parse_document_bounds +libmupdf.so:svg_parse_enum_from_style libmupdf.so:svg_parse_length libmupdf.so:svg_parse_number +libmupdf.so:svg_parse_number_from_style +libmupdf.so:svg_parse_string_from_style libmupdf.so:svg_parse_transform libmupdf.so:svg_run_document libmupdf.so:ucdn_compat_decompose diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,10 +1,12 @@ libGL.so.1 libX11.so.6 libXext.so.6 +libXrandr.so.2 libc.so.6 +libcrypto.so.1.1 libcurl.so.4 libfreetype.so.6 -libglut.so.3 +libgumbo.so.1 libharfbuzz.so.0 libjbig2dec.so.0 libjpeg.so.8 diff --git a/files/0001-shared_libs-1.patch b/files/Link-against-shared-libs.patch rename from files/0001-shared_libs-1.patch rename to files/Link-against-shared-libs.patch --- a/files/0001-shared_libs-1.patch +++ b/files/Link-against-shared-libs.patch @@ -1,8 +1,17 @@ +From aaa2d5971fa8419c2a7aec5361d909a45226d20a Mon Sep 17 00:00:00 2001 +From: Fabio Forni +Date: Sun, 6 Dec 2020 13:25:20 +0100 +Subject: [PATCH] Link against shared libs + +--- + Makefile | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + diff --git a/Makefile b/Makefile -index 814a592..27c18f4 100644 +index b0fb617..9fe5001 100644 --- a/Makefile +++ b/Makefile -@@ -20,7 +20,7 @@ include Makethird +@@ -24,7 +24,7 @@ include Makethird # 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. @@ -11,10 +20,10 @@ LIBS += $(XLIBS) -lm ifneq ($(threading),no) -@@ -189,17 +189,21 @@ generate: source/pdf/js/util.js.h - - # --- Library --- +@@ -214,15 +214,19 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO) + $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ) + else -MUPDF_LIB = $(OUT)/libmupdf.a -THIRD_LIB = $(OUT)/libmupdf-third.a -THREAD_LIB = $(OUT)/libmupdf-threads.a @@ -33,25 +42,18 @@ + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread $(PKCS7_LIB) : $(PKCS7_OBJ) + $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so + endif + + $(MUPDF_LIB) : $(MUPDF_OBJ) +@@ -230,7 +234,7 @@ $(THIRD_LIB) : $(THIRD_OBJ) + $(THREAD_LIB) : $(THREAD_OBJ) + $(PKCS7_LIB) : $(PKCS7_OBJ) -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) +INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) # --- Main tools and viewers --- -diff --git a/Makethird b/Makethird -index ab12fcc..02ddb70 100644 ---- a/Makethird -+++ b/Makethird -@@ -5,9 +5,9 @@ ifeq ($(USE_SYSTEM_LIBS),yes) - USE_SYSTEM_HARFBUZZ := yes - USE_SYSTEM_JBIG2DEC := yes - USE_SYSTEM_JPEGXR := no # not available -- USE_SYSTEM_LCMS2 := no # lcms2mt is strongly preferred -+ USE_SYSTEM_LCMS2 := yes - USE_SYSTEM_LIBJPEG := yes -- USE_SYSTEM_MUJS := no # not available -+ USE_SYSTEM_MUJS := yes - USE_SYSTEM_OPENJPEG := yes - USE_SYSTEM_ZLIB := yes - USE_SYSTEM_GLUT := yes +-- +2.29.2 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,12 +1,12 @@ name : mupdf -version : 1.17.0 -release : 4 +version : 1.18.0 +release : 5 source : - - https://github.com/ArtifexSoftware/mupdf/archive/1.17.0.tar.gz : 86bf76f88335cfe494ecb753ac8d714def3824718a815b0b42bce7e2dcefaf8d -homepage : https://mupdf.com/ + - https://mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz : 592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a +homepage : https://mupdf.com license : AGPL-3.0-or-later component : office.viewers -summary : lightweight PDF, XPS, and E-book viewer +summary : lightweight PDF, XPS, and e-book viewer description: | MuPDF is a lightweight PDF, XPS, and E-book viewer. MuPDF consists of a software library, command line tools, and viewers for various platforms. @@ -17,7 +17,7 @@ builddeps : - pkgconfig(freetype2) - pkgconfig(glu) - - pkgconfig(glut) + - pkgconfig(gumbo) - pkgconfig(harfbuzz) - pkgconfig(jbig2dec) - pkgconfig(lcms2) @@ -26,13 +26,28 @@ - pkgconfig(libturbojpeg) - pkgconfig(mujs) - pkgconfig(xext) + - pkgconfig(xi) + - pkgconfig(xrandr) setup : | - %patch -p1 < $pkgfiles/0001-shared_libs-1.patch + # MuPDF ships a patched freeglut that supports unicode. Use it. + find thirdparty -mindepth 1 -maxdepth 1 -not -name freeglut -exec rm -rf {} + + %patch -p1 < $pkgfiles/Link-against-shared-libs.patch + echo "\ + USE_SYSTEM_FREETYPE=yes + USE_SYSTEM_GUMBO=yes + USE_SYSTEM_HARFBUZZ=yes + USE_SYSTEM_JBIG2DEC=yes + USE_SYSTEM_LCMS2=yes + USE_SYSTEM_LIBJPEG=yes + USE_SYSTEM_MUJS=yes + USE_SYSTEM_OPENJPEG=yes + USE_SYSTEM_ZLIB=yes" > user.make build : | - rm -rf thirdparty/ - %make USE_SYSTEM_LIBS=yes + %make install : | - %make_install prefix=/usr USE_SYSTEM_LIBS=yes - install -Dm 00644 docs/logo/mupdf.png $installdir/usr/share/pixmaps/mupdf.png - install -Dm 00644 $pkgfiles/mupdf.desktop $installdir/usr/share/applications/mupdf.desktop + %make_install prefix=%PREFIX% + install -Dm00644 docs/logo/mupdf-logo.svg $installdir/usr/share/icons/hicolor/scalable/apps/mupdf.svg + install -Dm00644 $pkgfiles/mupdf.desktop -t $installdir/usr/share/applications + + # Not used anywhere. rm -rf $installdir/usr/lib/libmupdf-third.so diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -1,14 +1,14 @@ mupdf - https://mupdf.com/ + https://mupdf.com - Bryan T. Meyers - bmeyers@datadrake.com + Fabio Forni + livingsilver94.solus@redaril.me AGPL-3.0-or-later office.viewers - lightweight PDF, XPS, and E-book viewer + lightweight PDF, XPS, and e-book viewer MuPDF is a lightweight PDF, XPS, and E-book viewer. MuPDF consists of a software library, command line tools, and viewers for various platforms. The renderer in MuPDF is tailored for high quality anti-aliased graphics. It renders text with metrics and spacing accurate to within fractions of a pixel for the highest fidelity in reproducing the look of a printed page on screen. @@ -19,7 +19,7 @@ mupdf - lightweight PDF, XPS, and E-book viewer + lightweight PDF, XPS, and e-book viewer MuPDF is a lightweight PDF, XPS, and E-book viewer. MuPDF consists of a software library, command line tools, and viewers for various platforms. The renderer in MuPDF is tailored for high quality anti-aliased graphics. It renders text with metrics and spacing accurate to within fractions of a pixel for the highest fidelity in reproducing the look of a printed page on screen. @@ -46,6 +46,8 @@ /usr/share/doc/mupdf/coding-overview.html /usr/share/doc/mupdf/coding-progressive.html /usr/share/doc/mupdf/coding-style.html + /usr/share/doc/mupdf/ecosystem.html + /usr/share/doc/mupdf/ecosystem.png /usr/share/doc/mupdf/examples/bbox-device.js /usr/share/doc/mupdf/examples/create-thumbnail.js /usr/share/doc/mupdf/examples/draw-device.js @@ -57,8 +59,10 @@ /usr/share/doc/mupdf/examples/pdf-create-lowlevel.js /usr/share/doc/mupdf/examples/pdf-create.js /usr/share/doc/mupdf/examples/pdf-dejpx.js + /usr/share/doc/mupdf/examples/pdf-extract-rich-media.js /usr/share/doc/mupdf/examples/pdf-merge.js /usr/share/doc/mupdf/examples/pdf-portfolio.js + /usr/share/doc/mupdf/examples/pdf-trace.js /usr/share/doc/mupdf/examples/trace-device.js /usr/share/doc/mupdf/index.html /usr/share/doc/mupdf/manual-mupdf-gl.html @@ -74,9 +78,9 @@ /usr/share/doc/mupdf/style.css /usr/share/doc/mupdf/template.html /usr/share/doc/mupdf/thirdparty.html + /usr/share/icons/hicolor/scalable/apps/mupdf.svg /usr/share/man/man1/mupdf.1 /usr/share/man/man1/mutool.1 - /usr/share/pixmaps/mupdf.png @@ -90,7 +94,7 @@ programming.devel - mupdf + mupdf /usr/include/mupdf/fitz.h @@ -163,12 +167,12 @@ - - 2020-06-07 - 1.17.0 + + 2020-12-06 + 1.18.0 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file