[arch-commits] Commit in meld/repos/extra-any (5 files)
Jan Steffens
heftig at archlinux.org
Thu Nov 12 21:09:29 UTC 2015
Date: Thursday, November 12, 2015 @ 22:09:29
Author: heftig
Revision: 250824
archrelease: copy trunk to extra-any
Added:
meld/repos/extra-any/PKGBUILD
(from rev 250823, meld/trunk/PKGBUILD)
meld/repos/extra-any/meld.install
(from rev 250823, meld/trunk/meld.install)
Deleted:
meld/repos/extra-any/PKGBUILD
meld/repos/extra-any/meld.install
meld/repos/extra-any/text_iter.patch
-----------------+
PKGBUILD | 83 +++++++++++++++++++++++++-----------------------------
meld.install | 28 +++++++++---------
text_iter.patch | 11 -------
3 files changed, 53 insertions(+), 69 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-12 21:08:56 UTC (rev 250823)
+++ PKGBUILD 2015-11-12 21:09:29 UTC (rev 250824)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: 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.14.1
-pkgrel=2
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz"
- text_iter.patch)
-sha1sums=('a2db7e96bbd99dc038de22fb5e5a0f94668b76c1'
- 'b1820837bfeda67f557a390703b72855d5d78dbf')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Patch Gtk 3.18.3 API break https://bugzilla.gnome.org/show_bug.cgi?id=757881
- patch -Np1 -i ../text_iter.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- python2 setup.py build
-}
-
-package() {
- cd $pkgname-$pkgver
- # using --skip-build breaks install
- python2 setup.py --no-update-icon-cache --no-compile-schemas \
- install --prefix=/usr --root="$pkgdir" --optimize=1
-}
Copied: meld/repos/extra-any/PKGBUILD (from rev 250823, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-11-12 21:09:29 UTC (rev 250824)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: 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.14.1
+pkgrel=3
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz")
+sha1sums=('a2db7e96bbd99dc038de22fb5e5a0f94668b76c1')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+prepare() {
+ cd $pkgname-$pkgver
+}
+
+build() {
+ cd $pkgname-$pkgver
+ python2 setup.py build
+}
+
+package() {
+ cd $pkgname-$pkgver
+ # using --skip-build breaks install
+ python2 setup.py --no-update-icon-cache --no-compile-schemas \
+ install --prefix=/usr --root="$pkgdir" --optimize=1
+}
Deleted: meld.install
===================================================================
--- meld.install 2015-11-12 21:08:56 UTC (rev 250823)
+++ meld.install 2015-11-12 21:09:29 UTC (rev 250824)
@@ -1,14 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- glib-compile-schemas usr/share/glib-2.0/schemas
- 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/meld.install (from rev 250823, meld/trunk/meld.install)
===================================================================
--- meld.install (rev 0)
+++ meld.install 2015-11-12 21:09:29 UTC (rev 250824)
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: text_iter.patch
===================================================================
--- text_iter.patch 2015-11-12 21:08:56 UTC (rev 250823)
+++ text_iter.patch 2015-11-12 21:09:29 UTC (rev 250824)
@@ -1,11 +0,0 @@
---- meld-3.14.1-orig/meld/meldbuffer.py 2015-10-02 22:10:11.000000000 -0400
-+++ meld-3.14.1/meld/meldbuffer.py 2015-11-11 20:37:09.412543281 -0500
-@@ -76,6 +76,9 @@
- self.data.filename = filename
- self.data.label = label
-
-+ def get_iter_at_line(self, line):
-+ return super(MeldBuffer, self).get_iter_at_line(line)[1]
-+
- def get_iter_at_line_or_eof(self, line):
- """Return a Gtk.TextIter at the given line, or the end of the buffer.
More information about the arch-commits
mailing list