From edbf30408770e46b572d5d0e53f956109ef5cd2a Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 14 May 2016 10:11:24 +0200 Subject: [PATCH] - updated to 1.9a - updated shared patch, removed outdated mujs patch - v8 no longer supported --- mupdf-mujs.patch | 11 ---- mupdf-shared.patch | 132 +++++++++++++++++++++++++++------------------ mupdf.spec | 24 ++------- 3 files changed, 85 insertions(+), 82 deletions(-) delete mode 100644 mupdf-mujs.patch diff --git a/mupdf-mujs.patch b/mupdf-mujs.patch deleted file mode 100644 index 46cef92..0000000 --- a/mupdf-mujs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mupdf-1.8-source/source/pdf/js/pdf-jsimp-mu.c.orig 2015-11-10 17:19:51.000000000 +0100 -+++ mupdf-1.8-source/source/pdf/js/pdf-jsimp-mu.c 2016-04-14 21:43:36.345879945 +0200 -@@ -305,7 +305,7 @@ - void pdf_jsimp_execute(pdf_jsimp *imp, char *code) - { - js_State *J = imp->J; -- js_dostring(J, code, 0); -+ js_dostring(J, code); - } - - void pdf_jsimp_execute_count(pdf_jsimp *imp, char *code, int count) diff --git a/mupdf-shared.patch b/mupdf-shared.patch index 5916901..56ab205 100644 --- a/mupdf-shared.patch +++ b/mupdf-shared.patch @@ -1,6 +1,6 @@ ---- mupdf-1.8-source/Makefile.orig 2015-11-10 17:19:51.000000000 +0100 -+++ mupdf-1.8-source/Makefile 2016-04-14 20:39:17.552708551 +0200 -@@ -44,17 +44,24 @@ +--- mupdf-1.9a-source/Makefile.orig 2016-04-21 13:14:32.000000000 +0200 ++++ mupdf-1.9a-source/Makefile 2016-05-14 08:56:44.284541516 +0200 +@@ -41,17 +41,24 @@ ifneq "$(verbose)" "yes" QUIET_AR = @ echo ' ' ' ' AR $@ ; QUIET_CC = @ echo ' ' ' ' CC $@ ; @@ -25,7 +25,7 @@ MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ RM_CMD = $(QUIET_RM) rm -f $@ -@@ -91,47 +98,47 @@ +@@ -89,25 +96,25 @@ HTML_SRC_HDR := $(wildcard source/html/*.h) GPRF_SRC_HDR := $(wildcard source/gprf/*.h) @@ -42,30 +42,9 @@ +HTML_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(HTML_SRC)))) +GPRF_LOBJ := $(subst source/, $(OUT)/, $(addsuffix .lo, $(basename $(GPRF_SRC)))) - # --- Choice of Javascript library --- - ifeq "$(HAVE_MUJS)" "yes" -PDF_OBJ += $(OUT)/pdf/js/pdf-js.o --PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o -+PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo -+PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-mu.lo - THIRD_LIBS += $(MUJS_LIB) - LIBS += $(MUJS_LIBS) - CFLAGS += $(MUJS_CFLAGS) - else ifeq "$(HAVE_JSCORE)" "yes" --PDF_OBJ += $(OUT)/pdf/js/pdf-js.o --PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.o -+PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo -+PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-jscore.lo - LIBS += $(JSCORE_LIBS) - CFLAGS += $(JSCORE_CFLAGS) - else ifeq "$(HAVE_V8)" "yes" --PDF_OBJ += $(OUT)/pdf/js/pdf-js.o --PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o +PDF_LOBJ += $(OUT)/pdf/js/pdf-js.lo -+PDF_LOBJ += $(OUT)/pdf/js/pdf-jsimp-cpp.lo $(OUT)/pdf/js/pdf-jsimp-v8.lo - LIBS += $(V8_LIBS) - CFLAGS += $(V8_CFLAGS) else -PDF_OBJ += $(OUT)/pdf/js/pdf-js-none.o +PDF_LOBJ += $(OUT)/pdf/js/pdf-js-none.lo @@ -84,17 +63,46 @@ +$(HTML_LOBJ) : $(FITZ_HDR) $(HTML_HDR) $(HTML_SRC_HDR) +$(GPRF_LOBJ) : $(FITZ_HDR) $(GPRF_HDR) $(GPRF_SRC_HDR) + # --- Generated embedded font files --- + +@@ -123,7 +130,7 @@ + + FONT_BIN := $(FONT_BIN_DROID) $(FONT_BIN_NOTO) $(FONT_BIN_URW) $(FONT_BIN_SIL) + FONT_GEN := $(FONT_GEN_DROID) $(FONT_GEN_NOTO) $(FONT_GEN_URW) $(FONT_GEN_SIL) +-FONT_OBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN)))) ++FONT_LOBJ := $(subst $(GEN)/, $(OUT)/fonts/, $(addsuffix .o, $(basename $(FONT_GEN)))) + + $(GEN)/%.c : resources/fonts/droid/%.ttc $(FONTDUMP) + $(QUIET_GEN) $(FONTDUMP) $@ $< +@@ -134,33 +141,28 @@ + $(GEN)/%.c : resources/fonts/sil/%.cff $(FONTDUMP) + $(QUIET_GEN) $(FONTDUMP) $@ $< + +-$(FONT_OBJ) : $(FONT_GEN) ++$(FONT_LOBJ) : $(FONT_GEN) + $(FONT_GEN_DROID) : $(FONT_BIN_DROID) + $(FONT_GEN_NOTO) : $(FONT_BIN_NOTO) + $(FONT_GEN_URW) : $(FONT_BIN_URW) + # --- Library --- --MUPDF_LIB := $(OUT)/libmupdf.a -+MUPDF_LIB := $(OUT)/libmupdf.la +-MUPDF_LIB = $(OUT)/libmupdf.a +-THIRD_LIB = $(OUT)/libmupdfthird.a ++MUPDF_LIB = $(OUT)/libmupdf.la + +-MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) +-THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) ++MUPDF_LOBJ := $(FITZ_LOBJ) $(FONT_LOBJ) $(PDF_LOBJ) $(XPS_LOBJ) $(CBZ_LOBJ) $(HTML_LOBJ) $(GPRF_LOBJ) + +-$(MUPDF_LIB) : $(MUPDF_OBJ) +-$(THIRD_LIB) : $(THIRD_OBJ) ++$(MUPDF_LIB) : $(MUPDF_LOBJ) --$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) -+$(MUPDF_LIB) : $(FITZ_LOBJ) $(PDF_LOBJ) $(XPS_LOBJ) $(CBZ_LOBJ) $(HTML_LOBJ) $(GPRF_LOBJ) +-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) ++INSTALL_LIBS := $(MUPDF_LIB) - INSTALL_LIBS := $(MUPDF_LIB) + # --- Rules --- -@@ -140,10 +147,8 @@ $(ALL_DIR) $(OUT) $(GEN) : $(MKDIR_CMD) @@ -107,7 +115,7 @@ $(OUT)/%: $(OUT)/%.o $(LINK_CMD) -@@ -154,6 +159,12 @@ +@@ -171,6 +173,12 @@ $(OUT)/%.o : source/%.cpp | $(ALL_DIR) $(CXX_CMD) @@ -120,18 +128,16 @@ $(OUT)/%.o : scripts/%.c | $(OUT) $(CC_CMD) -@@ -233,12 +244,12 @@ +@@ -240,57 +248,57 @@ generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) $(NAME_GEN) -$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN) --$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN) -$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN) -$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN) -$(OUT)/pdf/pdf-object.o : source/pdf/pdf-name-table.h -$(OUT)/cmapdump.o : include/mupdf/pdf/cmap.h source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c source/pdf/pdf-name-table.h +$(OUT)/pdf/pdf-cmap-table.lo : $(CMAP_GEN) -+$(OUT)/pdf/pdf-fontfile.lo : $(FONT_GEN) +$(OUT)/pdf/pdf-pkcs7.lo : $(ADOBECA_GEN) +$(OUT)/pdf/js/pdf-js.lo : $(JAVASCRIPT_GEN) +$(OUT)/pdf/pdf-object.lo : source/pdf/pdf-name-table.h @@ -139,15 +145,18 @@ # --- Tools and Apps --- -@@ -247,19 +258,19 @@ + MUTOOL := $(addprefix $(OUT)/, mutool) + MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o murun.o pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o pdfmerge.o) $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR) - $(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIBS) +-$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB) ++$(MUTOOL) : $(MUPDF_LIB) $(MUTOOL) : $(MUTOOL_OBJ) - $(LINK_CMD) + $(LTLINK_CMD) MJSGEN := $(OUT)/mjsgen - $(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIBS) +-$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB) ++$(MJSGEN) : $(MUPDF_LIB) $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o) - $(LINK_CMD) + $(LTLINK_CMD) @@ -155,62 +164,81 @@ MUJSTEST := $(OUT)/mujstest MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR) - $(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIBS) +-$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB) ++$(MUJSTEST) : $(MUPDF_LIB) $(MUJSTEST) : $(MUJSTEST_OBJ) - $(LINK_CMD) + $(LTLINK_CMD) ifeq "$(HAVE_X11)" "yes" MUVIEW_X11 := $(OUT)/mupdf-x11 -@@ -267,7 +278,7 @@ + MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR) - $(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIBS) +-$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB) ++$(MUVIEW_X11) : $(MUPDF_LIB) $(MUVIEW_X11) : $(MUVIEW_X11_OBJ) - $(LINK_CMD) $(X11_LIBS) + $(LTLINK_CMD) $(X11_LIBS) ifeq "$(HAVE_GLFW)" "yes" MUVIEW_GLFW := $(OUT)/mupdf-gl -@@ -275,7 +286,7 @@ + MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o) $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h - $(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIBS) $(GLFW_LIB) +-$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB) ++$(MUVIEW_GLFW) : $(MUPDF_LIB) $(GLFW_LIB) $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ) - $(LINK_CMD) $(GLFW_LIBS) + $(LTLINK_CMD) $(GLFW_LIBS) endif ifeq "$(HAVE_CURL)" "yes" -@@ -284,7 +295,7 @@ + MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl + MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR) - $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) +-$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB) ++$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(CURL_LIB) $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ) - $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) + $(LTLINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) endif endif -@@ -294,7 +305,7 @@ +@@ -298,9 +306,9 @@ + MUVIEW_WIN32 := $(OUT)/mupdf + MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o) $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR) - $(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIBS) +-$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB) ++$(MUVIEW_WIN32) : $(MUPDF_LIB) $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ) - $(LINK_CMD) $(WIN32_LIBS) + $(LTLINK_CMD) $(WIN32_LIBS) endif MUVIEW := $(MUVIEW_X11) $(MUVIEW_WIN32) $(MUVIEW_GLFW) -@@ -307,9 +318,9 @@ +@@ -312,10 +320,10 @@ + examples: $(OUT)/example $(OUT)/multi-threaded - $(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIBS) +-$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB) - $(LINK_CMD) $(CFLAGS) -+ $(LTLINK_CMD) $(CFLAGS) - $(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIBS) +-$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB) - $(LINK_CMD) $(CFLAGS) -lpthread ++$(OUT)/example: docs/example.c $(MUPDF_LIB) ++ $(LTLINK_CMD) $(CFLAGS) ++$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) + $(LTLINK_CMD) $(CFLAGS) -lpthread # --- Update version string header --- -@@ -351,10 +362,10 @@ +@@ -343,7 +351,6 @@ + mandir ?= $(prefix)/share/man + docdir ?= $(prefix)/share/doc/mupdf + +-third: $(THIRD_LIB) + extra: $(CURL_LIB) $(GLFW_LIB) + libs: $(INSTALL_LIBS) + apps: $(INSTALL_APPS) +@@ -357,10 +364,10 @@ install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf install -d $(DESTDIR)$(libdir) diff --git a/mupdf.spec b/mupdf.spec index f4866ad..d26f946 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,19 +1,14 @@ -# -# Conditional build: -%bcond_with v8 # use V8 JS engine instead of MuJS -# Summary: MuPDF - lightweight PDF, XPS and CBZ viewer and parser/rendering library Summary(pl.UTF-8): MuPDF - lekka przeglądarka oraz biblioteka renderująca PDF, XPS, CBZ Name: mupdf -Version: 1.8 +Version: 1.9a Release: 1 License: AGPL v3+ Group: Applications/Text Source0: http://www.mupdf.com/downloads/%{name}-%{version}-source.tar.gz -# Source0-md5: 3205256d78d8524d67dd2a47c7a345fa +# Source0-md5: 658b90788a57d858dcb069cf326e11c3 Patch0: %{name}-openjpeg.patch Patch1: %{name}-shared.patch -Patch2: %{name}-mujs.patch URL: http://www.mupdf.com/ BuildRequires: OpenGL-glut-devel BuildRequires: curl-devel @@ -22,11 +17,10 @@ BuildRequires: glfw-devel BuildRequires: jbig2dec-devel BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel -%{!?with_v8:BuildRequires: mujs-devel >= 0-0.20160302} +BuildRequires: mujs-devel >= 0-0.20160302 BuildRequires: openjpeg2-devel >= 2.1.0 BuildRequires: openssl-devel BuildRequires: pkgconfig -%{?with_v8:BuildRequires: v8-devel} BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: zlib-devel @@ -61,10 +55,9 @@ Requires: freetype-devel >= 2 Requires: jbig2dec-devel Requires: libjpeg-devel Requires: libstdc++-devel -%{!?with_v8:Requires: mujs-devel} +Requires: mujs-devel Requires: openjpeg2-devel >= 2.1.0 Requires: openssl-devel -%{?with_v8:Requires: v8-devel} Requires: zlib-devel %description devel @@ -89,7 +82,6 @@ Statyczne biblioteki MuPDF. %setup -q -n %{name}-%{version}-source %patch0 -p1 %patch1 -p1 -%patch2 -p1 # use system libs instead %{__rm} -r thirdparty/{curl,freetype,glfw,jbig2dec,jpeg,mujs,openjpeg,zlib} @@ -100,15 +92,9 @@ LDFLAGS="%{rpmldflags}" \ %{__make} -j1 \ CC="%{__cc}" \ CXX="%{__cxx}" \ -%if %{with v8} - HAVE_V8=yes \ - V8_CFLAGS= \ - V8_LIBS="-lv8 -lstdc++" \ -%else HAVE_MUJS=yes \ MUJS_CFLAGS= \ MUJS_LIBS="-lmujs" \ -%endif SYS_OPENJPEG_CFLAGS="$(pkg-config --cflags libopenjp2)" \ build=release \ libdir=%{_libdir} \ @@ -119,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - V8_PRESENT=yes \ + HAVE_MUJS=yes \ build=release \ prefix=%{_prefix} \ libdir=%{_libdir} -- 2.43.0