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

[Jan Steffens]

    Date: Thursday, November 12, 2015 @ 22:01:26
  Author: heftig
Revision: 250819

gtk 3.18.4 reverted API change

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

-----------------+
 PKGBUILD        |   11 +++--------
 text_iter.patch |   11 -----------
 2 files changed, 3 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-12 21:01:11 UTC (rev 250818)
+++ PKGBUILD	2015-11-12 21:01:26 UTC (rev 250819)
@@ -6,7 +6,7 @@
 
 pkgname=meld
 pkgver=3.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Visual diff and merge tool'
 url='http://meldmerge.org/'
 license=(GPL)
@@ -16,10 +16,8 @@
 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')
+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.
@@ -26,9 +24,6 @@
 
 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() {

Deleted: text_iter.patch
===================================================================
--- text_iter.patch	2015-11-12 21:01:11 UTC (rev 250818)
+++ text_iter.patch	2015-11-12 21:01:26 UTC (rev 250819)
@@ -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.