diff --git a/MATE-1.20-CHANGES.TXT b/MATE-1.20-CHANGES.TXT index f9129de..69fee12 100644 --- a/MATE-1.20-CHANGES.TXT +++ b/MATE-1.20-CHANGES.TXT @@ -6,3 +6,4 @@ Renamed Packages in MATE 1.20: Packages removed in MATE 1.20: docutils vte3 +vala diff --git a/README.TXT b/README.TXT index 8acf9ff..403f299 100644 --- a/README.TXT +++ b/README.TXT @@ -27,7 +27,7 @@ How to build and install the MATE packages using these scripts: 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 21 packages. Please use "su" or "su -" to build as root instead +a total of 20 packages. 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 diff --git a/UPGRADE.TXT b/UPGRADE.TXT index e1aa84a..1497760 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 + removepkg vte3 docutils vala 3. It's advisable to reinstall vte and python-docutils @@ -35,11 +35,11 @@ any of the mirror sites. Please note that MATE 1.20 has new package. 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 56 +packages from the /deps directory) then you should have a total of 55 packages: $ ls /var/log/packages | grep _msb | wc -l - 56 + 55 We wish everyone good luck with this! Please report any issues to mateslackbuilds@gmail.com. diff --git a/deps/vala/slack-desc b/deps/vala/slack-desc deleted file mode 100644 index d043df8..0000000 --- a/deps/vala/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -vala: vala (Compiler for the GObject type system) -vala: -vala: Vala is a new programming language that aims to bring modern -vala: programming language features to GNOME developers without imposing -vala: any additional runtime requirements and without using a different -vala: ABI compared to applications and libraries written in C. -vala: -vala: Project URL: https://github.com/GNOME/vala/ -vala: -vala: -vala: diff --git a/deps/vala/vala.SlackBuild b/deps/vala/vala.SlackBuild deleted file mode 100644 index eaab96d..0000000 --- a/deps/vala/vala.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# Slackware build script for Vala - -# Copyright 2009-2016 Erik W. Hanson, Minneapolis, MN, USA -# 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=vala -VERSION=${VERSION:-0.40.6} -BUILD=${BUILD:-1} -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 http://ftp.acc.umu.se/pub/GNOME/sources/$PRGNAM/0.40/$PRGNAM-$VERSION.tar.xz - -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-$VERSION.tar.xz -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=/usr/man/ \ - --disable-static \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/mate-build-deps.sh b/mate-build-deps.sh index bf53819..c3ea4fb 100755 --- a/mate-build-deps.sh +++ b/mate-build-deps.sh @@ -43,7 +43,6 @@ CHECKDUPLICATE=0 for dir in \ deps/zenity \ deps/graphviz \ - deps/vala \ deps/rarian \ deps/yelp-xsl \ deps/yelp-tools \