[arch-commits] Commit in meld/trunk (PKGBUILD fs38148.patch)

[Jan Steffens]

    Date: Thursday, January 23, 2014 @ 00:13:00
  Author: heftig
Revision: 204565

1.8.4

Modified:
  meld/trunk/PKGBUILD
Deleted:
  meld/trunk/fs38148.patch

---------------+
 PKGBUILD      |   15 ++++++---------
 fs38148.patch |   12 ------------
 2 files changed, 6 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-22 22:10:13 UTC (rev 204564)
+++ PKGBUILD	2014-01-22 23:13:00 UTC (rev 204565)
@@ -4,8 +4,8 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=meld
-pkgver=1.8.3
-pkgrel=2
+pkgver=1.8.4
+pkgrel=1
 pkgdesc='Visual diff and merge tool'
 url='http://meldmerge.org/'
 license=('GPL')
@@ -15,10 +15,8 @@
 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"
-        'fs38148.patch')
-sha1sums=('b2321e45466a963cb7bd85e6b648c9648b35af52'
-          'fd32ca8db546e7d63f99433de5724d642fba88f8')
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('4d0b87a367c0a0ee8bb0403cfb366ebe92b10418')
 
 install=install
 options=('!emptydirs')
@@ -25,8 +23,6 @@
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../fs38148.patch
-	sed -i 's/update-/#update-/' Makefile
 	sed -i 's/env python/env python2/' bin/meld
 }
 
@@ -37,5 +33,6 @@
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install
+	make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install \
+		update_desktop_database= update_mime_database=
 }

Deleted: fs38148.patch
===================================================================
--- fs38148.patch	2014-01-22 22:10:13 UTC (rev 204564)
+++ fs38148.patch	2014-01-22 23:13:00 UTC (rev 204565)
@@ -1,12 +0,0 @@
-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