From ff3a9a095583976656062f3ba6f38c6fca5edeb6 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 27 Nov 2016 16:05:13 +0000 Subject: [PATCH] lxpanel-0.9.1, lxde-common-0.99.2, mupdf-1.10 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18016 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 4 +- introduction/welcome/changelog.xml | 13 +++ lxde/desktop/lxde-common.xml | 20 ++-- lxde/desktop/lxpanel.xml | 8 +- packages.ent | 6 +- pst/ps/mupdf.xml | 156 +++++++++++++++++++++++++---- 6 files changed, 169 insertions(+), 38 deletions(-) diff --git a/general.ent b/general.ent index dc63db1a49..2367c6b18e 100644 --- a/general.ent +++ b/general.ent @@ -1,12 +1,12 @@ - + - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index b54d1468c6..2850bc5338 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -46,6 +46,19 @@ November 27th, 2016 + + [pierre] - Update to mupdf-1.10, and add a patch for + generating shared libraries (courtesy of Armin K). Fixes + #8562. + + + [pierre] - Update to lxpanel-0.9.1. Fixes + #8561. + + + [pierre] - Update to lxde-common-0.99.2. Fixes + #8560. + [dj] - Update to dbus-1.10.12. Fixes #8424. diff --git a/lxde/desktop/lxde-common.xml b/lxde/desktop/lxde-common.xml index 6ae28e409f..67be27faf1 100644 --- a/lxde/desktop/lxde-common.xml +++ b/lxde/desktop/lxde-common.xml @@ -6,9 +6,9 @@ - - - + + + ]> @@ -74,7 +74,6 @@ Required - , , , , @@ -99,7 +98,9 @@ A notification daemon such as or - + , and a display manager such as + or + @@ -154,7 +155,8 @@ update-desktop-database -q cat > ~/.xinitrc << "EOF" -ck-launch-session dbus-launch --exit-with-session startlxde +# No need to run dbus-launch, since it is run by startlxde +ck-launch-session startlxde EOF startx @@ -177,10 +179,10 @@ startx - You may wish to drop consolekit and/or dbus-launch, e.g., just using + You may wish to drop consolekit, just using startlxde in ~/.xinitrc. However some capabilities such as mounting or - umounting file systems from a file manager will not be possible, or the - reboot option will be absent or inoperative, among other problems. + umounting file systems from a file manager will not be available, or + the reboot option will be absent or inoperative, among other problems. diff --git a/lxde/desktop/lxpanel.xml b/lxde/desktop/lxpanel.xml index 470e968e1c..ee19f695e7 100644 --- a/lxde/desktop/lxpanel.xml +++ b/lxde/desktop/lxpanel.xml @@ -6,9 +6,9 @@ - + - + ]> @@ -151,9 +151,7 @@ make liblxpanel.so and several under /usr/lib/lxpanel/plugins - /etc/xdg/lxpanel, - /usr/include/lxpanel, - /usr/lib/lxpanel and + /etc/xdg/lxpanel, /usr/include/lxpanel, /usr/lib/lxpanel, and /usr/share/lxpanel diff --git a/packages.ent b/packages.ent index 3c691e3fdd..a3db515d33 100644 --- a/packages.ent +++ b/packages.ent @@ -633,10 +633,10 @@ - + - + @@ -848,7 +848,7 @@ - + diff --git a/pst/ps/mupdf.xml b/pst/ps/mupdf.xml index 909bb873da..7434c10852 100644 --- a/pst/ps/mupdf.xml +++ b/pst/ps/mupdf.xml @@ -8,10 +8,10 @@ can be found there, no need to change directory --> - - - - + + + + ]> @@ -73,16 +73,10 @@ can be found there, no need to change directory --> Additional Downloads - - - Required patch: - - - Recommended patch: - + @@ -105,6 +99,7 @@ can be found there, no need to change directory --> Optional , + (runtime), GLFW, and jbig2dec @@ -134,8 +129,9 @@ rm -rf thirdparty/jpeg && rm -rf thirdparty/openjpeg && rm -rf thirdparty/zlib && -patch -Np1 -i ../mupdf-&mupdf-version;-upstream_fix-1.patch && -patch -Np1 -i ../mupdf-&mupdf-version;-openjpeg21-1.patch && +sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c && + +patch -Np1 -i ../mupdf-&mupdf-version;-shared_libs-1.patch && make build=release @@ -147,9 +143,29 @@ make build=release Now, as the root user: -install -v -m 755 build/release/mupdf-x11-curl /usr/bin/mupdf && +make prefix=/usr \ + build=release \ + docdir=/usr/share/doc/mupdf-&mupdf-version; \ + install && +ln -sfv mupdf-x11-curl /usr/bin/mupdf -install -v -m 644 docs/man/mupdf.1 /usr/share/man/man1/ + + + + Command Explanations + + + sed '/OPJ_STATIC$/d' ... : Remove a switch, which + prevents using shared libraries for openjpeg2. + + + + ln -sfv mupdf-x11-curl /usr/bin/mupdf : Three + mupdf executables are installed: + mupdf-gl, mupdf-x11, and + mupdf-x11-curl. This symbolic link allows to choose + which one is used when running mupdf. + @@ -162,9 +178,10 @@ install -v -m 644 docs/man/mupdf.1 /usr/share/man/man1/ Installed Directories - mupdf - None - None + mujstest, mupdf(symlink), mupdf-gl, mupdf-x11, mupdf-x11-curl, + muraster, mutool + libmupdf.so, libmupdfthird.so + /usr/include/mupdf, /usr/share/doc/mupdf-&mupdf-version; @@ -173,17 +190,118 @@ install -v -m 644 docs/man/mupdf.1 /usr/share/man/man1/ + + mujstest + + + is a test program for mupdf + javascript + + + mujstest + + + + mupdf - is a program for viewing PDF and XPS documents. + is a program for viewing PDF, XPS, EPUB, and CBZ documents, + and various image formats such as PNG, JPEG, GIFF, and TIFF. mupdf + + + mupdf-gl + + + same as mupdf, using an opengl renderer. + + + mupdf-gl + + + + + + mupdf-x11 + + + same as mupdf, using an X Window renderer. + + + mupdf-x11 + + + + + + mupdf-x11-curl + + + same as mupdf, using an X Window renderer, + with the capability of rendering web pages, using an + http://... url. + + + mupdf-x11-curl + + + + + + muraster + + + transforms files in one of the formats displayable by mupdf into + a graphic file. + + + muraster + + + + + + mutool + + + deals with document files in various manners. + + + mutool + + + + + + libmupdf.so + + + contains the mupdf API functions. + + + libmupdf.so + + + + + + libmupdfthird.so + + + contains the third party libraries compiled for mudpf. + + + libmupdfthird.so + + + +