summaryrefslogtreecommitdiff
path: root/development/meld3
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-01-02 17:40:29 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-01-02 17:40:29 +0700
commit97542b79de62c1a63828bf1f1f0fedd9aedc4035 (patch)
tree8efa4d63c93db584e2972b2bb86300db6dcb5d09 /development/meld3
parentd06632ca178d1f9fc04df86adb982fd9bf144973 (diff)
downloadslackbuilds-97542b79de62c1a63828bf1f1f0fedd9aedc4035.tar.gz
development/meld3: Updated for version 3.12.3.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/meld3')
-rw-r--r--development/meld3/meld3.SlackBuild7
-rw-r--r--development/meld3/meld3.info6
-rw-r--r--development/meld3/utf8.patch10
3 files changed, 6 insertions, 17 deletions
diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild
index 831ce3247e..92483dc41e 100644
--- a/development/meld3/meld3.SlackBuild
+++ b/development/meld3/meld3.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for meld3
-# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
PRGNAM=meld3
SRCNAM=meld
-VERSION=${VERSION:-3.12.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.12.3}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -68,7 +68,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-patch -p1 < $CWD/utf8.patch
python setup.py install --root=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/development/meld3/meld3.info b/development/meld3/meld3.info
index 1df8653dad..437dc1b604 100644
--- a/development/meld3/meld3.info
+++ b/development/meld3/meld3.info
@@ -1,8 +1,8 @@
PRGNAM="meld3"
-VERSION="3.12.2"
+VERSION="3.12.3"
HOMEPAGE="http://meldmerge.org/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/meld/3.12/meld-3.12.2.tar.xz"
-MD5SUM="a11c4abf923d136e410fa9e8217c0bba"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/meld/3.12/meld-3.12.3.tar.xz"
+MD5SUM="4cb8cf5d1f07b4350d253f325b9c9c20"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="pygobject3 gtksourceview3"
diff --git a/development/meld3/utf8.patch b/development/meld3/utf8.patch
deleted file mode 100644
index b435936ee6..0000000000
--- a/development/meld3/utf8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meld/patchdialog.py
-+++ b/meld/patchdialog.py
-@@ -118,6 +118,7 @@
- filename = self.filediff._get_filename_for_saving(
- _("Save Patch"))
- if filename:
-+ txt = txt.encode('utf-8')
- self.filediff._save_text_to_filename(filename, txt)
- break
-