diff options
Diffstat (limited to 'development/meld')
| -rw-r--r-- | development/meld/README | 13 | ||||
| -rw-r--r-- | development/meld/doinst.sh | 4 | ||||
| -rw-r--r-- | development/meld/meld.SlackBuild | 40 | ||||
| -rw-r--r-- | development/meld/meld.info | 12 |
4 files changed, 53 insertions, 16 deletions
diff --git a/development/meld/README b/development/meld/README index 58fdf7d4d1..4d9d7587ca 100644 --- a/development/meld/README +++ b/development/meld/README @@ -1,5 +1,8 @@ -Meld is a visual diff and merge tool. You can compare two or three files and -edit them in place (diffs update dynamically). You can compare two or three -folders and launch file comparisons. You can browse and view a working copy -from popular version control systems such such as CVS, Subversion, Bazaar-ng -and Mercurial. Look at the screenshots page for more detailed features. +Meld is a visual diff and merge tool. + +You can compare two or three files and edit them in place +(diffs update dynamically). You can compare two or three folders and launch +file comparisons. You can browse and view a working copy from popular version +control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. + +Optional dependency: pygtksourceview (for syntax highlighting) diff --git a/development/meld/doinst.sh b/development/meld/doinst.sh index 3e5691a052..031ae07d05 100644 --- a/development/meld/doinst.sh +++ b/development/meld/doinst.sh @@ -7,3 +7,7 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi diff --git a/development/meld/meld.SlackBuild b/development/meld/meld.SlackBuild index ceaf95a97a..3a2d0d0444 100644 --- a/development/meld/meld.SlackBuild +++ b/development/meld/meld.SlackBuild @@ -2,10 +2,30 @@ # Slackware build script for meld -# Written by K.D.Hedger kdhedger@yahoo.co.uk +# Originally Written by K.D.Hedger kdhedger@yahoo.co.uk +# Previously maintained by Lorenzo +# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# 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. PRGNAM=meld -VERSION=${VERSION:-1.8.2} +VERSION=${VERSION:-1.8.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -22,10 +42,18 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -LIBDIRSUFFIX="" - -if [ "$ARCH" = "x86_64" ]; then +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -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 rm -rf $PKG @@ -46,6 +74,8 @@ make prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} docdir=/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf $PKG/usr/share/pixmaps + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/development/meld/meld.info b/development/meld/meld.info index 2ad83bf7a9..c2ee311366 100644 --- a/development/meld/meld.info +++ b/development/meld/meld.info @@ -1,10 +1,10 @@ PRGNAM="meld" -VERSION="1.8.2" -HOMEPAGE="http://meld.sourceforge.net/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/meld/1.8/meld-1.8.2.tar.xz" -MD5SUM="2bdf7fd2a1044ed03d7fbde35dd830d1" +VERSION="1.8.4" +HOMEPAGE="http://meldmerge.org/" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/meld/1.8/meld-1.8.4.tar.xz" +MD5SUM="d9e5038487ae0b8694191370fcc87fb8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="dmitrinove" -EMAIL="dmitrinove@yahoo.com" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" |