[arch-commits] Commit in meld/repos/extra-any (5 files)

[Eric Bélanger]

    Date: Monday, May 19, 2014 @ 02:27:36
  Author: eric
Revision: 213117

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
    (from rev 213116, meld/trunk/PKGBUILD)
  meld/repos/extra-any/PKGBUILD-3.11
    (from rev 213116, meld/trunk/PKGBUILD-3.11)
  meld/repos/extra-any/install
    (from rev 213116, meld/trunk/install)
Deleted:
  meld/repos/extra-any/PKGBUILD
  meld/repos/extra-any/install

---------------+
 PKGBUILD      |   76 ++++++++++++++++++++++++++++----------------------------
 PKGBUILD-3.11 |   34 +++++++++++++++++++++++++
 install       |   26 +++++++++----------
 3 files changed, 85 insertions(+), 51 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-19 00:25:27 UTC (rev 213116)
+++ PKGBUILD	2014-05-19 00:27:36 UTC (rev 213117)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=meld
-pkgver=1.8.4
-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=('4d0b87a367c0a0ee8bb0403cfb366ebe92b10418')
-
-install=install
-options=('!emptydirs')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -i 's/env python/env python2/' bin/meld
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PYTHON=/usr/bin/python2 prefix=/usr
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install \
-		update_desktop_database= update_mime_database=
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 213116, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-05-19 00:27:36 UTC (rev 213117)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=meld
+pkgver=1.8.5
+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=('a1f01bc68820c7e35c374dfb1923ed20ac28e603')
+
+install=install
+options=('!emptydirs')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed -i 's/env python/env python2/' bin/meld
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make PYTHON=/usr/bin/python2 prefix=/usr
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install \
+		update_desktop_database= update_mime_database=
+}

Copied: meld/repos/extra-any/PKGBUILD-3.11 (from rev 213116, meld/trunk/PKGBUILD-3.11)
===================================================================
--- PKGBUILD-3.11	                        (rev 0)
+++ PKGBUILD-3.11	2014-05-19 00:27:36 UTC (rev 213117)
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 204566 2014-01-22 23:15:09Z heftig $
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=meld
+pkgver=3.11.0
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=('GPL')
+arch=('any')
+makedepends=('intltool' 'itstool')
+depends=('python2-gobject' 'gtk3' 'gtksourceview3' 'hicolor-icon-theme' 'desktop-file-utils')
+source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('3a23ef1b813bdcb3f8fd0308d46ba83f8536c90b')
+
+# Don't forget to add the glib-compile-schemas call to install before using this PKGBUILD
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	python2 setup.py build
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+
+	# Missing files; required
+	install -d "${pkgdir}"/usr/share/{glib-2.0/schemas,icons}
+	cp -r data/icons/hicolor data/icons/HighContrast "${pkgdir}/usr/share/icons"
+	cp data/org.gnome.meld.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas"
+}

Deleted: install
===================================================================
--- install	2014-05-19 00:25:27 UTC (rev 213116)
+++ install	2014-05-19 00:27:36 UTC (rev 213117)
@@ -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 213116, meld/trunk/install)
===================================================================
--- install	                        (rev 0)
+++ install	2014-05-19 00:27:36 UTC (rev 213117)
@@ -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
+}