diff --git a/MATE-1.12-CHANGES.TXT b/MATE-1.12-CHANGES.TXT index e44699e..88f212a 100644 --- a/MATE-1.12-CHANGES.TXT +++ b/MATE-1.12-CHANGES.TXT @@ -3,6 +3,7 @@ New Packages in MATE 1.12: Renamed Packages in MATE 1.12: Packages removed in MATE 1.12: +libgnomecanvas (no longer needed) atkmm (included in 14.2) cairomm (included in 14.2) glibmm (included in 14.2) diff --git a/README.TXT b/README.TXT index 412af4d..0e8c7ff 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/deps/libgnomecanvas/libgnomecanvas.SlackBuild b/deps/libgnomecanvas/libgnomecanvas.SlackBuild deleted file mode 100644 index 2212eef..0000000 --- a/deps/libgnomecanvas/libgnomecanvas.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# Slackware build script for libgnomecanvas -# -# Written by James Rich james@chowhouse.com -# -# Modified by the SlackBuilds.org project -# (assumed to be public domain per our submission policy) -# Modified by Frank Caraballo -# -# Maintained by Erik Hanson - -# Modified by Willy Sudiarto Raharjo for MSB Project - -PRGNAM=libgnomecanvas -VERSION=${VERSION:-2.30.3} -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://download.gnome.org/sources/$PRGNAM/2.30/$PRGNAM-$VERSION.tar.bz2 - - - -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" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-glade \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING.LIB INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -ln -s /usr/share/gtk-doc/html/libgnomecanvas $PKG/usr/doc/$PRGNAM-$VERSION/html - -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/deps/libgnomecanvas/slack-desc b/deps/libgnomecanvas/slack-desc deleted file mode 100644 index f04f43c..0000000 --- a/deps/libgnomecanvas/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libgnomecanvas: libgnomecanvas (GNOME canvas library) -libgnomecanvas: -libgnomecanvas: The GNOME canvas is an engine for structured graphics that offers -libgnomecanvas: a rich imaging model, high performance rendering, and a powerful, -libgnomecanvas: high-level API. It offers a choice of two rendering back-ends, one -libgnomecanvas: based on Xlib for extremely fast display, and another based on Libart, -libgnomecanvas: a sophisticated, antialiased, alpha-compositing engine. Applications -libgnomecanvas: have a choice between the Xlib imaging model or a superset of the -libgnomecanvas: PostScript imaging model, depending on the level of graphic -libgnomecanvas: sophistication required. -libgnomecanvas: diff --git a/mate-build-deps.sh b/mate-build-deps.sh index afca95b..f85a819 100755 --- a/mate-build-deps.sh +++ b/mate-build-deps.sh @@ -37,7 +37,6 @@ MSBROOT=$(pwd) # Loop for all dependency packages for dir in \ - deps/libgnomecanvas \ deps/zenity \ deps/rarian \ deps/yelp-xsl \