summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-10-28 23:15:39 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-10-28 23:15:39 +0000
commit6fb6c801d371d95178499b232bdc4d1ab5d6dc6c (patch)
tree4db70d4e38a08bea4d24ff725742981b5e3feb2a /app-editors
parentClean up old revision and update gentoo lang file, bug #275110. (diff)
downloadgentoo-2-6fb6c801d371d95178499b232bdc4d1ab5d6dc6c.tar.gz
gentoo-2-6fb6c801d371d95178499b232bdc4d1ab5d6dc6c.tar.bz2
gentoo-2-6fb6c801d371d95178499b232bdc4d1ab5d6dc6c.zip
Version bump. Add patch to fix external tools plugin configuration dialog, bug #207457.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/gedit/ChangeLog9
-rw-r--r--app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch21
-rw-r--r--app-editors/gedit/gedit-2.26.3-r1.ebuild (renamed from app-editors/gedit/gedit-2.26.2.ebuild)12
3 files changed, 39 insertions, 3 deletions
diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 784dab2abf82..81b2536dece7 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-editors/gedit
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.279 2009/10/24 16:32:36 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.280 2009/10/28 23:15:34 eva Exp $
+
+*gedit-2.26.3-r1 (28 Oct 2009)
+
+ 28 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -gedit-2.26.2.ebuild,
+ +gedit-2.26.3-r1.ebuild, +files/gedit-2.26.3-external_tools_config.patch:
+ Version bump. Add patch to fix external tools plugin configuration dialog,
+ bug #207457.
24 Oct 2009; nixnut <nixnut@gentoo.org> gedit-2.26.3.ebuild:
ppc stable #281427
diff --git a/app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch b/app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch
new file mode 100644
index 000000000000..d46d0357f750
--- /dev/null
+++ b/app-editors/gedit/files/gedit-2.26.3-external_tools_config.patch
@@ -0,0 +1,21 @@
+diff -NurdB gedit-2.26.3/plugins/externaltools/tools/tools.ui gedit-2.26.3.patched/plugins/externaltools/tools/tools.ui
+--- gedit-2.26.3/plugins/externaltools/tools/tools.ui 2009-07-03 03:54:58.000000000 +1000
++++ gedit-2.26.3.patched/plugins/externaltools/tools/tools.ui 2009-10-18 20:03:25.737001974 +1100
+@@ -331,7 +331,7 @@
+ <property name="model">model_output</property>
+ <property name="visible">True</property>
+ <child>
+- <object class="GtkCellRendererText" id="input_renderer"/>
++ <object class="GtkCellRendererText" id="input_renderer2"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+@@ -351,7 +351,7 @@
+ <property name="model">model_input</property>
+ <property name="visible">True</property>
+ <child>
+- <object class="GtkCellRendererText" id="input_renderer"/>
++ <object class="GtkCellRendererText" id="input_renderer3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
diff --git a/app-editors/gedit/gedit-2.26.2.ebuild b/app-editors/gedit/gedit-2.26.3-r1.ebuild
index e515ebb56fa3..f1d055771393 100644
--- a/app-editors/gedit/gedit-2.26.2.ebuild
+++ b/app-editors/gedit/gedit-2.26.3-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.26.2.ebuild,v 1.1 2009/05/17 21:45:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.26.3-r1.ebuild,v 1.1 2009/10/28 23:15:34 eva Exp $
GCONF_DEBUG="no"
-inherit gnome2 python
+inherit eutils gnome2 python
DESCRIPTION="A text editor for the GNOME desktop"
HOMEPAGE="http://www.gnome.org/"
@@ -62,6 +62,14 @@ src_unpack() {
# disable pyc compiling
mv "${S}"/py-compile "${S}"/py-compile.orig
ln -s $(type -P true) "${S}"/py-compile
+
+ # Fix intltoolize broken file, see upstream #577133
+ sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+ || die "sed expression failed"
+
+ # Fix object labels that makes the configuration dialog not shown,
+ # bug #207457
+ epatch "${FILESDIR}/${P}-external_tools_config.patch"
}
pkg_postinst() {