deac/exherbo-impulze
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bump meld to 1.5.0

Browse source 
Notes:
 - INSTALL seems to list wrong dependencies.
   See https://bugzilla.gnome.org/show_bug.cgi?id=643473
   And http://git.gnome.org/browse/meld/commit/?id=beb2de34b2483882b981bf04282cea2f29c52a43
 - freshmeat and sourceforge don't seem to be updated (not even 1.4.0 is there),
   so those got removed. DOWNLOADS is used from gnome.org.exlib
 - tests are broken, so they got RESTRICTed.
   make check just runs some QA on the sources (checks for tabs) and tries to
   modify some files, which are not even there
   make test needs X and fails because files are missing
This commit is contained in:
Benedikt Morbach 2011-03-08 14:10:04 +01:00 committed by Daniel Mierswa
parent 47ab62cee3
commit 2d3c0ae2f2
2 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/dev-util/meld/files/meld-1.5.0-three-way-button-fix.patch Normal file
View file

@ -0,0 +1,28 @@
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

22
packages/dev-util/meld/meld-1.4.0.exheres-0 → packages/dev-util/meld/meld-1.5.0.exheres-0
View file

@ -1,41 +1,45 @@
# Copyright 2009 Daniel Mierswa <impulze@impulze.org>
# Distributed under the terms of the GNU General Public License v2
require multilib sourceforge
require multilib gnome.org
SUMMARY="A visual diff and merge tool."
DESCRIPTION="Rich featured diff and merge tool that integrates with most
version control systems. It's also possible to do 3-way diffs."
DOWNLOADS="mirror://gnome/sources/${PN}/$(ever range 1-2)/${PNV}.tar.bz2"
HOMEPAGE="http://live.gnome.org/${PN^}"
LICENCES="GPL-2"
SLOT="0"
PLATFORMS="~amd64 ~x86"
MYOPTIONS=""
REMOTE_IDS+=" freshmeat:Meld"
# make check doesn't run tests but some upstream QA
# make test needs X and fails because files are missing
RESTRICT="test"
DEPENDENCIES="
build:
sys-devel/gettext
build+run:
dev-lang/python
dev-lang/python[>=2.5]
run:
gnome-bindings/gnome-python[gnome][gnomevfs]
gnome-bindings/pygtk
gnome-bindings/pygobject:2[>=2.16.0]
gnome-bindings/pygtk[>=2.14]
suggestion:
gnome-bindings/pygtksourceview
gnome-bindings/pygtksourceview:2[>=2.4]
[[ description = [ syntax highlighting, line numbers, etc. ] ]]
"
# scrollkeeper can probably build the documentation
# LANGUAGES="" prevents building help/ subdir, which seems to need that
DEFAULT_SRC_COMPILE_PARAMS=( prefix=/usr libdir=/usr/$(get_libdir) docdir_='$(docdir)'/${PNV} LANGUAGES="" )
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[@]} )
src_install() {
default
edo rmdir "${IMAGE}"/usr/share/gnome/{help/meld,help,}
edo rmdir "${IMAGE}"/usr/share/gnome/{help/meld,help,} \
"${IMAGE}"/usr/share/pixmaps
}