diff --git a/MATE-1.20-CHANGES.TXT b/MATE-1.20-CHANGES.TXT index 69fee12..cb2ed80 100644 --- a/MATE-1.20-CHANGES.TXT +++ b/MATE-1.20-CHANGES.TXT @@ -1,5 +1,4 @@ New Packages in MATE 1.20: -graphviz Renamed Packages in MATE 1.20: @@ -7,3 +6,4 @@ Packages removed in MATE 1.20: docutils vte3 vala +graphviz diff --git a/README.TXT b/README.TXT index 403f299..a880e88 100644 --- a/README.TXT +++ b/README.TXT @@ -26,9 +26,8 @@ How to build and install the MATE packages using these scripts: 1. Clone the Git repo or download a tarball/zip of the repo. 2. Run the 'mate-build-deps.sh' in the msb root directory which will build -and install all the necessary dependencies in the /deps directory. There are -a total of 20 packages. Please use "su" or "su -" to build as root instead -of using "sudo". +and install all the necessary dependencies in the /deps directory. +Please use "su" or "su -" to build as root instead of using "sudo". 3. Run the 'mate-build-base.sh' in the msb root directory which will build and install all the base (required) packages. There are a total of 24 packages diff --git a/UPGRADE.TXT b/UPGRADE.TXT index 1497760..d08820b 100644 --- a/UPGRADE.TXT +++ b/UPGRADE.TXT @@ -24,7 +24,7 @@ any of the mirror sites. Please note that MATE 1.20 has new package. upgradepkg --install-new --reinstall /path/to/extra/*.txz 2. Remove deprecated packages - removepkg vte3 docutils vala + removepkg vte3 docutils vala graphviz 3. It's advisable to reinstall vte and python-docutils @@ -33,13 +33,7 @@ any of the mirror sites. Please note that MATE 1.20 has new package. manager. ALWAYS run this command for both new installations or upgrades from MATE 1.18 -At this point you should be running MATE 1.20 on Slackware Current. :-) If -you have installed everything from /base and /extra (which will include -packages from the /deps directory) then you should have a total of 55 -packages: - - $ ls /var/log/packages | grep _msb | wc -l - 55 +At this point you should be running MATE 1.20 on Slackware Current. :-) We wish everyone good luck with this! Please report any issues to mateslackbuilds@gmail.com. diff --git a/deps/graphviz/doinst.sh b/deps/graphviz/doinst.sh deleted file mode 100644 index 86cc279..0000000 --- a/deps/graphviz/doinst.sh +++ /dev/null @@ -1,18 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/php.d/graphviz.ini.new - -# Configure plugins -# (writes /usr/lib*/graphviz/config6 with available plugin information) -chroot . /usr/bin/dot -c diff --git a/deps/graphviz/ghostscript918.patch b/deps/graphviz/ghostscript918.patch deleted file mode 100644 index 189c513..0000000 --- a/deps/graphviz/ghostscript918.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uprb graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c graphviz-2.38.0/plugin/gs/gvloadimage_gs.c ---- graphviz-2.38.0.orig/plugin/gs/gvloadimage_gs.c 2014-04-13 23:40:25.000000000 +0300 -+++ graphviz-2.38.0/plugin/gs/gvloadimage_gs.c 2015-11-11 00:08:32.916123704 +0200 -@@ -72,11 +72,11 @@ static void gs_error(GVJ_t * job, const - - assert (err < 0); - -- if (err >= e_VMerror) -+ if (err >= gs_error_VMerror) - errsrc = "PostScript Level 1"; -- else if (err >= e_unregistered) -+ else if (err >= gs_error_unregistered) - errsrc = "PostScript Level 2"; -- else if (err >= e_invalidid) -+ else if (err >= gs_error_invalidid) - errsrc = "DPS error"; - else - errsrc = "Ghostscript internal error"; diff --git a/deps/graphviz/graphviz.SlackBuild b/deps/graphviz/graphviz.SlackBuild deleted file mode 100644 index 485ad25..0000000 --- a/deps/graphviz/graphviz.SlackBuild +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/sh - -# Slackware build script for graphviz - -# Copyright 2007 Robby Workman -# Copyright 2011 Heinz Wiesinger -# Copyright 2013-2017 Audrius Kažukauskas -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Modified by Willy Sudiarto Raharjo for MSB Project - -PRGNAM=graphviz -VERSION=${VERSION:-2.40.1} -BUILD=${BUILD:-2} -TAG=${TAG:-_msb} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -wget -c https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz - -CWD=$(pwd) -TMP=${TMP:-/tmp/msb} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Install PHP bindings to proper location. -sed -i 's|/php/modules|/php/extensions|' configure - -# Fix for php-5.4 -patch -p1 -i $CWD/php_5.4_compat.patch - -# Patch from Arch (thanks!) -patch -p1 -i $CWD/ghostscript918.patch - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --disable-static \ - --enable-ocaml=no \ - --enable-php=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -# Install config file for PHP. -mkdir -p $PKG/etc/php.d -sed "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" $CWD/graphviz.ini > $PKG/etc/php.d/graphviz.ini.new - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Remove empty directories of language bindings that are absent. -find $PKG/usr/lib${LIBDIRSUFFIX}/graphviz -depth -type d -empty -exec rmdir {} \; - -# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz so that it -# will be removed when the package is uninstalled. This file is generated by -# the postinstall script and contains information about available plugins, so -# this is (or at least should be) safe. -# -# Write some dummy content to it to avoid -# "Error: /usr/lib64/graphviz/config6 is zero sized, or other read error." -# message during installation. -echo '# Dummy content.' > $PKG/usr/lib${LIBDIRSUFFIX}/graphviz/config6 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/$PRGNAM/doc/* $PKG/usr/doc/$PRGNAM-$VERSION -rmdir $PKG/usr/share/$PRGNAM/doc -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/deps/graphviz/graphviz.ini b/deps/graphviz/graphviz.ini deleted file mode 100644 index 86c1706..0000000 --- a/deps/graphviz/graphviz.ini +++ /dev/null @@ -1,12 +0,0 @@ -; Enable graphviz extension module -; extension=gv.so - -; Graphviz' own documentation mentions a "gv.php" file that should -; be included. This file is however not necessary, it is just a -; wrapper class around functions that are already available after -; loading the extension, just leave out the "gv::" prefix. -; In case you still prefer to use the wrapper class you have to -; include it using its absolute path: -; diff --git a/deps/graphviz/php_5.4_compat.patch b/deps/graphviz/php_5.4_compat.patch deleted file mode 100644 index 58c2993..0000000 --- a/deps/graphviz/php_5.4_compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur graphviz-2.28.0.orig/tclpkg/gv/gv_php_init.c graphviz-2.28.0/tclpkg/gv/gv_php_init.c ---- graphviz-2.28.0.orig/tclpkg/gv/gv_php_init.c 2011-01-25 17:30:51.000000000 +0100 -+++ graphviz-2.28.0/tclpkg/gv/gv_php_init.c 2012-05-30 04:10:40.657221055 +0200 -@@ -19,11 +19,13 @@ - - static size_t gv_string_writer (GVJ_t *job, const char *s, size_t len) - { -+ TSRMLS_FETCH(); - return PHPWRITE(s, len); - } - - static size_t gv_channel_writer (GVJ_t *job, const char *s, size_t len) - { -+ TSRMLS_FETCH(); - return PHPWRITE(s, len); - } - diff --git a/deps/graphviz/slack-desc b/deps/graphviz/slack-desc deleted file mode 100644 index c2564f0..0000000 --- a/deps/graphviz/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -graphviz: graphviz (Graph Visualization) -graphviz: -graphviz: Graphviz is open source graph visualization software. -graphviz: It has several main graph layout programs. It also has -graphviz: web and interactive graphical interfaces, and auxiliary -graphviz: tools, libraries, and language bindings. -graphviz: -graphviz: Homepage: http://graphviz.org/ -graphviz: -graphviz: -graphviz: diff --git a/mate-build-deps.sh b/mate-build-deps.sh index c3ea4fb..b188898 100755 --- a/mate-build-deps.sh +++ b/mate-build-deps.sh @@ -42,7 +42,6 @@ CHECKDUPLICATE=0 # Loop for all dependency packages for dir in \ deps/zenity \ - deps/graphviz \ deps/rarian \ deps/yelp-xsl \ deps/yelp-tools \