From 2459f71fee4140accc9d00e9940a082656e4f10b Mon Sep 17 00:00:00 2001
From: Benedikt Morbach <benedikt.morbach@googlemail.com>
Date: Mon, 21 Mar 2011 00:31:06 +0100
Subject: [PATCH] Bump meld to 1.5.1

---
 .../meld-1.5.0-three-way-button-fix.patch     | 28 -------------------
 ...d-1.5.0.exheres-0 => meld-1.5.1.exheres-0} |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 packages/dev-util/meld/files/meld-1.5.0-three-way-button-fix.patch
 rename packages/dev-util/meld/{meld-1.5.0.exheres-0 => meld-1.5.1.exheres-0} (94%)

diff --git a/packages/dev-util/meld/files/meld-1.5.0-three-way-button-fix.patch b/packages/dev-util/meld/files/meld-1.5.0-three-way-button-fix.patch
deleted file mode 100644
index ef1a29e..0000000
--- a/packages/dev-util/meld/files/meld-1.5.0-three-way-button-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e0f1adacad183b8ba5dd2cecb4eb2027b3bd0df6 Mon Sep 17 00:00:00 2001
-From: Kai Willadsen <kai.willadsen@gmail.com>
-Date: Fri, 14 Jan 2011 18:44:33 +1000
-Subject: [PATCH] Fix three-way compare buttons closing New Diff dialog
-
-Upstream: yes, git e0f1adacad183b8ba5dd2cecb4eb2027b3bd0df6
-Reason: bug, hitting the toggle should not close the window
-
----
- data/ui/meldapp.ui |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui
-index 62f3c3e..fd552ec 100644
---- a/data/ui/meldapp.ui
-+++ b/data/ui/meldapp.ui
-@@ -455,8 +455,6 @@ Josef Vybíral</property>
-       </object>
-     </child>
-     <action-widgets>
--      <action-widget response="0">three_way_compare0</action-widget>
--      <action-widget response="0">three_way_compare1</action-widget>
-       <action-widget response="-6">button_cancel</action-widget>
-       <action-widget response="-5">button_ok</action-widget>
-     </action-widgets>
--- 
-1.7.4.1
-
diff --git a/packages/dev-util/meld/meld-1.5.0.exheres-0 b/packages/dev-util/meld/meld-1.5.1.exheres-0
similarity index 94%
rename from packages/dev-util/meld/meld-1.5.0.exheres-0
rename to packages/dev-util/meld/meld-1.5.1.exheres-0
index fdfcee5..9178b34 100644
--- a/packages/dev-util/meld/meld-1.5.0.exheres-0
+++ b/packages/dev-util/meld/meld-1.5.1.exheres-0
@@ -32,7 +32,6 @@ DEPENDENCIES="
 # scrollkeeper can probably build the documentation
 # LANGUAGES="" prevents building help/ subdir, which seems to need that
 
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-three-way-button-fix.patch )
 DEFAULT_SRC_COMPILE_PARAMS=( prefix=/usr libdir=/usr/$(get_libdir) docdir_='$(docdir)'/${PNVR} LANGUAGES="" )
 DEFAULT_SRC_INSTALL_PARAMS=( ${DEFAULT_SRC_COMPILE_PARAMS[@]} )