Date: Saturday, December 21, 2013 @ 16:01:15 Author: heftig Revision: 202384
Fix crash FS#38148 Added: meld/trunk/fs38148.patch Modified: meld/trunk/PKGBUILD ---------------+ PKGBUILD | 26 ++++++++++++++++---------- fs38148.patch | 12 ++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-21 14:15:26 UTC (rev 202383) +++ PKGBUILD 2013-12-21 15:01:15 UTC (rev 202384) @@ -5,7 +5,7 @@ pkgname=meld pkgver=1.8.3 -pkgrel=1 +pkgrel=2 pkgdesc='Visual diff and merge tool' url='http://meldmerge.org/' license=('GPL') @@ -15,24 +15,30 @@ optdepends=('pygtksourceview2: syntax highlighting' 'python2-dbus: open a new tab in an already running instance' 'python2-gconf: gnome integration') -source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) -sha1sums=('b2321e45466a963cb7bd85e6b648c9648b35af52') +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"; + fs38148.patch) +sha1sums=('b2321e45466a963cb7bd85e6b648c9648b35af52' + 'fd32ca8db546e7d63f99433de5724d642fba88f8') install=install options=('!emptydirs') prepare() { - cd "${pkgname}-${pkgver}" - sed -i 's/update-/#update-/' Makefile - sed -i 's/env python/env python2/' bin/meld + cd ${pkgname}-${pkgver} + + # Fix a crash when using Italian + patch -Np1 -i ../fs38148.patch + + sed -i 's/update-/#update-/' Makefile + sed -i 's/env python/env python2/' bin/meld } build() { - cd "${pkgname}-${pkgver}" - make PYTHON=/usr/bin/python2 prefix=/usr + cd ${pkgname}-${pkgver} + make PYTHON=/usr/bin/python2 prefix=/usr } package() { - cd "${pkgname}-${pkgver}" - make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install + cd ${pkgname}-${pkgver} + make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install } Added: fs38148.patch =================================================================== --- fs38148.patch (rev 0) +++ fs38148.patch 2013-12-21 15:01:15 UTC (rev 202384) @@ -0,0 +1,12 @@ +diff -u -r meld-1.8.3/po/it.po meld-1.8.3-crash/po/it.po +--- meld-1.8.3/po/it.po 2013-12-14 23:07:26.000000000 +0100 ++++ meld-1.8.3-crash/po/it.po 2013-12-21 15:52:01.322550023 +0100 +@@ -1752,7 +1752,7 @@ + "Not present" + msgstr "" + "Ignorato:Non in revisione:::Errore::Aggiunto recentemente:Modificato:" +-"Conflitto:Rimosso:Mancante" ++"Conflitto:Rimosso:Mancante:Non presente" + + #: ../meld/vc/cvs.py:231 + #, python-format
