summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/meld3/meld3.SlackBuild3
-rw-r--r--development/meld3/utf8.patch10
2 files changed, 12 insertions, 1 deletions
diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild
index 9a313df94b..831ce3247e 100644
--- a/development/meld3/meld3.SlackBuild
+++ b/development/meld3/meld3.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=meld3
SRCNAM=meld
VERSION=${VERSION:-3.12.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -68,6 +68,7 @@ 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/utf8.patch b/development/meld3/utf8.patch
new file mode 100644
index 0000000000..b435936ee6
--- /dev/null
+++ b/development/meld3/utf8.patch
@@ -0,0 +1,10 @@
+--- 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
+