Apply Debian 00_resensitize-find-button.patch and 01_fix-first-replace.patch wrt #302020 to restore Find and Replace functionality.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 107 insertions, 12 deletions

diff --git a/app-editors/mousepad/ChangeLog b/app-editors/mousepad/ChangeLog
index e9e77b843d1d..4d31b3411d78 100644
--- a/app-editors/mousepad/ChangeLog
+++ b/app-editors/mousepad/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-editors/mousepad
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mousepad/ChangeLog,v 1.19 2010/01/01 21:06:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mousepad/ChangeLog,v 1.20 2010/02/19 08:59:44 ssuominen Exp $
+
+*mousepad-0.2.16-r1 (19 Feb 2010)
+
+  19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +mousepad-0.2.16-r1.ebuild,
+  +files/mousepad-0.2.16-fix-first-replace.patch,
+  +files/mousepad-0.2.16-resensitize-find-button.patch:
+  Apply Debian 00_resensitize-find-button.patch and
+  01_fix-first-replace.patch wrt #302020 to restore Find and Replace
+  functionality.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   mousepad-0.2.16.ebuild:
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 9acdc00a748a..79c216bb7078 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mousepad-0.2.16-fix-first-replace.patch 1313 RMD160 7b1d6baac1c135605d40521feefc64cc324ac119 SHA1 c122c8627944abdc3d1b4bc69288cf1bad853310 SHA256 f9973e9e3872033d759ca9156fd8b750e74d7e44d524b116f17b75996e13d25e
+AUX mousepad-0.2.16-resensitize-find-button.patch 1153 RMD160 c8206c4b1fbddaca71547a5053a4d067906294e0 SHA1 27e8a05949f3474527e9c4055ccca828c3f6eb80 SHA256 724e955cd31f6bc36ddd83016049db0209c916af7d18e6f7399a35f61f8cdc97
 DIST mousepad-0.2.16.tar.bz2 332253 RMD160 673a52a38dfa60388db11322cd08189c1b2c10e3 SHA1 4e63033e0a71578f3ec9a0d2e6a505efd0424ef9 SHA256 86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
+EBUILD mousepad-0.2.16-r1.ebuild 924 RMD160 70f650b934fc710bc7934be283cf9d8b55def712 SHA1 582cb82507810df1de8ee3742d5938248b442a84 SHA256 8b524786a107887ef283c52a777fb46fece84bd3a6ce8c413d2193fbb73b320e
 EBUILD mousepad-0.2.16.ebuild 801 RMD160 055300632d56b05d2468cc23e8e1f512966d1324 SHA1 ec537626fff740854462ba0f8aabece402daef6c SHA256 761d9547823c70ddce02ea35d476e82e0f70d8503efaa63331027f4ec71b81b2
-MISC ChangeLog 7445 RMD160 56de6a6a38b09595b39aec7aa772f2ba34aa86da SHA1 79b04f5f7a6f5516720203a32d7d535bcfc79456 SHA256 3877f1e20605c6440adc4453b8ce2ff4b55f7a863c4b133a13802fe72535f638
+MISC ChangeLog 7813 RMD160 457a89ad3c29667a68af2534bf8fb208b4369b8c SHA1 1f4a28b86ed5af82a349d7b350d717051a8031e6 SHA256 5f4fbbb2e4250b23b5719dfe7c88e5a23be08e22269f6bce7c275376572382d4
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+Y8oACgkQNQqtfCuFneN8AACeJbl8gFZWLX6hXlBckfMmOW1d
-yCoAn3rHy04jypXoulFo+WkEEEDfxvRi
-=fSkP
------END PGP SIGNATURE-----
diff --git a/app-editors/mousepad/files/mousepad-0.2.16-fix-first-replace.patch b/app-editors/mousepad/files/mousepad-0.2.16-fix-first-replace.patch
new file mode 100644
index 000000000000..2569f83303f4
--- /dev/null
+++ b/app-editors/mousepad/files/mousepad-0.2.16-fix-first-replace.patch
@@ -0,0 +1,35 @@
+--- src/search.c
++++ src/search.c
+@@ -78,7 +78,7 @@
+ static gint document_replace_real(StructData *sd)
+ {
+ 	GtkTextIter iter, match_start, match_end;
+-	GtkTextMark *mark_init = NULL;
++	GtkTextMark *mark_init = NULL, *mark_start, *mark_end;
+ 	gboolean res;
+ 	gint num = 0;
+ 	GtkWidget *q_dialog = NULL;
+@@ -113,6 +113,11 @@
+ 				if (num == 0 && q_dialog == NULL)
+ 					q_dialog = create_dialog_message_question(
+ 						gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?"));
++
++				gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end);
++				mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE);
++				mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE);
++
+ 				switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
+ 				case GTK_RESPONSE_CANCEL:
+ 					res = 0;
+@@ -122,6 +127,11 @@
+ 				case GTK_RESPONSE_NO:
+ 					continue;
+ 				}
++
++				gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start);
++				gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end);
++				gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start);
++				gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end);
+ 			}
+ 			gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
+ 			undo_set_sequency(TRUE);
diff --git a/app-editors/mousepad/files/mousepad-0.2.16-resensitize-find-button.patch b/app-editors/mousepad/files/mousepad-0.2.16-resensitize-find-button.patch
new file mode 100644
index 000000000000..719b31ce9c9f
--- /dev/null
+++ b/app-editors/mousepad/files/mousepad-0.2.16-resensitize-find-button.patch
@@ -0,0 +1,28 @@
+--- src/search.c
++++ src/search.c
+@@ -210,8 +210,11 @@
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+ 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+-	 if (sd->search.string_find) 
++	 if (sd->search.string_find) {
+ 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++			GTK_RESPONSE_OK, TRUE);
++	 }
+ 
+ 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+ 	gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
+@@ -275,8 +278,11 @@
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+ 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
+ 		G_CALLBACK(toggle_sensitivity), NULL);
+-	 if (sd->search.string_find) 
++	 if (sd->search.string_find) {
+ 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
++		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
++			GTK_RESPONSE_OK, TRUE);
++	}
+ 	label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
+ 	 gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
+ 	 gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/app-editors/mousepad/mousepad-0.2.16-r1.ebuild b/app-editors/mousepad/mousepad-0.2.16-r1.ebuild
new file mode 100644
index 000000000000..17a6a585207a
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.2.16-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mousepad/mousepad-0.2.16-r1.ebuild,v 1.1 2010/02/19 08:59:44 ssuominen Exp $
+
+EAPI=2
+inherit xfconf
+
+DESCRIPTION="A simple text editor for Xfce"
+HOMEPAGE="http://www.xfce.org/projects/mousepad/"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=xfce-base/libxfcegui4-4.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable debug)"
+	PATCHES=( "${FILESDIR}/${P}-resensitize-find-button.patch"
+		"${FILESDIR}/${P}-fix-first-replace.patch" )
+}