From afbdde9276c509ea783d1905cb9b0edf8f996647 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sat, 7 Jan 2023 14:10:12 +0000 Subject: [PATCH] Misc builds updates 07 January 2023 version for imlib2, graphviz, and inkscape modified man to pdf creation for graphviz --- Misc/graphviz/README | 3 +- Misc/graphviz/graphviz.SlackBuild | 64 +++++++++++++++++-------------- Misc/imlib2/imlib2.SlackBuild | 16 +++++--- Misc/inkscape/inkscape.SlackBuild | 4 +- README.md | 1 - 5 files changed, 48 insertions(+), 40 deletions(-) diff --git a/Misc/graphviz/README b/Misc/graphviz/README index a70a5c8..f1464a5 100644 --- a/Misc/graphviz/README +++ b/Misc/graphviz/README @@ -11,6 +11,5 @@ gts is an optional dependency. ------------------------------ -pdf and html documentation is not installed by default. -To install it, use the GVZ_DOCS=y command line option as detailed in the SlackBuild. +Man pages are also created as pdfs. The page/paper size can be set with the command line option PS= or will default to the size set for the system locale. diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index d7118ca..6af7dc1 100755 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=graphviz -VERSION=5.0.1 +VERSION=7.0.5 BUILD=${BUILD:-1} TAG=${TAG:-} @@ -72,23 +72,27 @@ patch -p0 << EOF } EOF -## The primary purpose of this build is for 'dot' for kscope, tdeedu, ... -## To include the pdf and html documentation, build with 'GVZ_DOCS=y ./BUILD-TDE.sh' -[[ ${GVZ_DOCS:-} != [yY1] ]] && { -patch -p0 << EOF ---- Makefile.in -+++ Makefile.in -@@ -614 +614 @@ --SUBDIRS = \$(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests -+SUBDIRS = \$(subdirs) lib plugin cmd tclpkg contrib share graphs tests -EOF -sed -i '/tcldot.html/d' tclpkg/tcldot/Makefile.in +## .. output man pages to pdf, sans-serif [helvetica] font, 10pt, indentation, page size, paper size +## with at least one line before a section heading +## User set paper size or as per locale - see groff_font for valid sizes +[[ ! ${PS:-} ]] && { +[[ $(locale LC_PAPER) == 297* ]] && PS=a4 || PS=letter } -## relevant if including docs, but not installed otherwise -sed -i 's|../doc/||;28,54s|../pdf/|../../../man/man1/|;58,71s|../pdf/|../../../man/man3/|;28,71s|\.pdf|\.gz|' doc/index.html -sed -i '56,62d;s|pages (PDF)|pages|' doc/index.html -sed -i '/dotty/d;/lefty/d;/circo/d;/fdp/d;/gv2gxl/d;/neato\.1/d;/twopi/d;/\/graph/d' doc/index.html +# +echo 'patching for man page pdfs' +find . -name "Makefile.*" | while read file +do +sed -i '/(PS2PDF)/d' $file +sed -i 's|psfile=$${pdffile%pdf}ps; ||' $file +sed -i 's|$(GROFF) -Tps.*$|sed "s^.PP^^;s^\.SH^\\n\&^" $< \| $(GROFF) -man -Tpdf -fH -rS10 -rIN=4n -dpaper='"$PS"' -P-p'"$PS"' > $$pdffile|' $file +done +# +## the pdfs are installed in the same directory as index.html +sed -i 's|../doc/||;s|../pdf/||' doc/index.html +## add the cgraph tutorial sed -i 's|libguide.*$|&\n
  • cgraph tutorial|' doc/index.html +## these don't exist +sed -i '/dotty/d;/lefty/d;/circo/d;/fdp/d;/gv2gxl/d;/neato\.1/d;/twopi/d;/>graph/d;/tkspline/d' doc/index.html listdocs_fn @@ -96,16 +100,19 @@ chown_fn cd_builddir_fn +PRFX=/usr/local +## build machine id is based on config.sub which doesn't work for a 32bit os/64bit kernel combination +[[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && BLD=--build=i586-pc-linux-gnu + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --mandir=/usr/man \ - --enable-man-pdfs=no \ - --enable-ocaml=no + --prefix=$PRFX \ + --libdir=$PRFX/lib$LIBDIRSUFFIX \ + --mandir=$PRFX/man \ + --enable-ocaml=no ${BLD:-} make_fn @@ -122,20 +129,20 @@ cat << EOF > $PKG/etc/php.d/graphviz.ini.new ; In case you still prefer to use the wrapper class you have to ; include it using its absolute path: ; EOF # Remove empty directories of language bindings that are absent. -find $PKG/usr/lib$LIBDIRSUFFIX/graphviz -depth -type d -empty -exec rmdir {} \; +find $PKG$PRFX/lib$LIBDIRSUFFIX/graphviz -depth -type d -empty -exec rmdir {} \; # Configure plugins -# (writes $PKG/usr/lib$LIBDIRSUFFIX/graphviz/config6 with available plugin information) -LD_LIBRARY_PATH=$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/bin/dot -c +# (writes $PKG$PRFX/lib$LIBDIRSUFFIX/graphviz/config6 with available plugin information) +LD_LIBRARY_PATH=$PKG$PRFX/lib$LIBDIRSUFFIX $PKG$PRFX/bin/dot -c installdocs_fn -INSTALL_TDE=/usr +INSTALL_TDE=$PRFX mangzip_fn strip_fn @@ -175,10 +182,9 @@ $PRGNAM: It has several main graph layout programs. It also has $PRGNAM: web and interactive graphical interfaces, and auxiliary $PRGNAM: tools, libraries, and language bindings. $PRGNAM: -$PRGNAM: Homepage: graphviz.org -$PRGNAM: -$PRGNAM: +$PRGNAM: Documentation: $PRFX/share/doc/graphviz/index.html $PRGNAM: +$PRGNAM: Homepage: graphviz.org $PRGNAM: " > $PKG/install/slack-desc diff --git a/Misc/imlib2/imlib2.SlackBuild b/Misc/imlib2/imlib2.SlackBuild index ada61fd..1316b61 100755 --- a/Misc/imlib2/imlib2.SlackBuild +++ b/Misc/imlib2/imlib2.SlackBuild @@ -21,18 +21,21 @@ # SUCH DAMAGE. PRGNAM=imlib2 -VERSION=1.9.1 +VERSION=1.10.0 BUILD=${BUILD:-1} TAG=${TAG:-} ARCHIVE_TYPE="tar.xz" -SRCURL="https://sourceforge.net/projects/enlightenment/files/$PRGNAM-src/$VERSION/$PRGNAM-$VERSION.$ARCHIVE_TYPE" +SRCURL="https://downloads.sourceforge.net/project/enlightenment/$PRGNAM-src/$VERSION/$PRGNAM-$VERSION.$ARCHIVE_TYPE" source ../../get-source.sh getsource_fn untar_fn +## remove obsolete tags +doxygen -u doc/Doxyfile.in + listdocs_fn chown_fn @@ -40,17 +43,18 @@ chown_fn cd_builddir_fn ## gcc visibility hidden is the default +PRFX=/usr/local CFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ ../configure \ - --prefix=/usr/local \ - --libdir=/usr/local/lib$LIBDIRSUFFIX \ + --prefix=$PRFX \ + --libdir=$PRFX/lib$LIBDIRSUFFIX \ --enable-doc-build \ --disable-static make_fn -INSTALL_TDE=/usr/local +INSTALL_TDE=$PRFX installdocs_fn ## index.html should be created during the build [[ -s doc/html/index.html ]] && cp doc/html/{index.html,imlib2_logo.png} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION @@ -79,7 +83,7 @@ $PRGNAM: * Apply filters to images $PRGNAM: * Scale images $PRGNAM: * Apply color correction .. and more $PRGNAM: -$PRGNAM: See /usr/local/doc/$PRGNAM-$VERSION/index.html for the full list. +$PRGNAM: See $PRFX/doc/$PRGNAM-$VERSION/index.html for the full list. $PRGNAM: " > $PKG/install/slack-desc diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index 3a79daa..ed0a202 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=inkscape -VERSION=1.2.1 +VERSION=1.2.2 BUILD=${BUILD:-1} ARCHIVE_TYPE="tar.xz" @@ -147,7 +147,7 @@ sed -i "s|*.pod.in|$pods|" man/CMakeLists.txt ## and install man pages to $prefix, as per most other Slackware packages sed -i 's|MANFILE_DEST "${CMAKE_INSTALL_FULL_MANDIR}|MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/man|' CMakeScripts/Pod2man.cmake # -## Add the TRANSLATING file if any of the locales has no start-welcome-text.$I18N.svg +## Add the TRANSLATING file if any of the locales has no start-welcome-text.$locale.svg [[ ${COUNT_I18N:-} != ${COUNT_TEXT:-} ]] && I18N_SVG="TRANSLATING $I18N_SVG" sed -i "s|\"\*.svg\"|$I18N_SVG|" share/screens/CMakeLists.txt diff --git a/README.md b/README.md index b187840..691481c 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorsta * BUILD= - sets the package build identifier, overriding the SlackBuild default of 1 * GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs * FEAT= - for development builds - see get-source.sh -* GVZ_DOCS=y - for graphviz, include documentation - see SlackBuild * build_regextester=[yp] - build the regex tester from the tqt3 example - see the tqt3 README * mailmerge=n - build kword without mailmerge - see the koffice README and SlackBuild