Date: Saturday, December 21, 2013 @ 16:03:15
Author: heftig
Revision: 202386
archrelease: copy trunk to extra-any
Added:
meld/repos/extra-any/PKGBUILD
(from rev 202385, meld/trunk/PKGBUILD)
meld/repos/extra-any/fs38148.patch
(from rev 202385, meld/trunk/fs38148.patch)
meld/repos/extra-any/install
(from rev 202385, meld/trunk/install)
Deleted:
meld/repos/extra-any/PKGBUILD
meld/repos/extra-any/install
---------------+
PKGBUILD | 82 ++++++++++++++++++++++++++++++--------------------------
fs38148.patch | 12 ++++++++
install | 26 ++++++++---------
3 files changed, 69 insertions(+), 51 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-21 15:02:38 UTC (rev 202385)
+++ PKGBUILD 2013-12-21 15:03:15 UTC (rev 202386)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Daniel J Griffiths <[email protected]>
-# Contributor: Douglas Soares de Andrade <[email protected]>
-
-pkgname=meld
-pkgver=1.8.3
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=('GPL')
-arch=('any')
-makedepends=('intltool' 'gnome-doc-utils')
-depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-utils')
-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')
-
-install=install
-options=('!emptydirs')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- 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
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install
-}
Copied: meld/repos/extra-any/PKGBUILD (from rev 202385, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-12-21 15:03:15 UTC (rev 202386)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+# Contributor: Douglas Soares de Andrade <[email protected]>
+
+pkgname=meld
+pkgver=1.8.3
+pkgrel=2
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=('GPL')
+arch=('any')
+makedepends=('intltool' 'gnome-doc-utils')
+depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-utils')
+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')
+
+install=install
+options=('!emptydirs')
+
+prepare() {
+ 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
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install
+}
Copied: meld/repos/extra-any/fs38148.patch (from rev 202385,
meld/trunk/fs38148.patch)
===================================================================
--- fs38148.patch (rev 0)
+++ fs38148.patch 2013-12-21 15:03:15 UTC (rev 202386)
@@ -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
Deleted: install
===================================================================
--- install 2013-12-21 15:02:38 UTC (rev 202385)
+++ install 2013-12-21 15:03:15 UTC (rev 202386)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: meld/repos/extra-any/install (from rev 202385, meld/trunk/install)
===================================================================
--- install (rev 0)
+++ install 2013-12-21 15:03:15 UTC (rev 202386)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
