From e33253a4bf91ad1f9739ce6d3b84cd6ff5b54288 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:27:32 +0000 Subject: [PATCH 1/6] Initialize branch F-10 for xchat-gnome --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From c31624e11c473c97fee5dc13b146ee63b0f5f213 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Thu, 27 Nov 2008 02:46:29 +0000 Subject: [PATCH 2/6] - Update to 0.24.1. - Update Source URL. --- .cvsignore | 2 +- sources | 2 +- xchat-gnome.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 55a13bd..9689b10 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xchat-gnome-0.24.0.tar.bz2 +xchat-gnome-0.24.1.tar.bz2 diff --git a/sources b/sources index 7b48cd3..5673e90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -925010f01f593e6ff7027f2ba523c607 xchat-gnome-0.24.0.tar.bz2 +34738e4bfd0cb4a6627f6b40a99932d2 xchat-gnome-0.24.1.tar.bz2 diff --git a/xchat-gnome.spec b/xchat-gnome.spec index ec54ab5..70d908f 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,12 +1,12 @@ Name: xchat-gnome -Version: 0.24.0 +Version: 0.24.1 Release: 1%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet License: GPLv2+ URL: http://%{name}.navi.cx/ -Source0: http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://ftp.acc.umu.se/pub/gnome/sources/%{name}/0.24/%{name}-%{version}.tar.bz2 # Patch specific to Fedora to use .xchat-gnome, instead of .xchat2 Patch0: %{name}-0.23.92-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -136,6 +136,10 @@ fi %changelog +* Wed Nov 26 2008 Brian Pepple - 0.24.1-1 +- Update to 0.24.1. +- Update Source URL. + * Tue Sep 23 2008 Brian Pepple - 0.24.0-1 - Update to 0.24.0. - Drop deps patch. Fixed upstream. From e93f9281cdb6a503ee19dc59729ad3df691db633 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Sun, 10 May 2009 12:01:51 +0000 Subject: [PATCH 3/6] - Add patch to fix topic entry bug. (#483839) --- xchat-gnome.spec | 9 ++++++++- xchat-topic-update.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 xchat-topic-update.patch diff --git a/xchat-gnome.spec b/xchat-gnome.spec index 70d908f..aba4990 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,6 +1,6 @@ Name: xchat-gnome Version: 0.24.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -9,6 +9,9 @@ URL: http://%{name}.navi.cx/ Source0: http://ftp.acc.umu.se/pub/gnome/sources/%{name}/0.24/%{name}-%{version}.tar.bz2 # Patch specific to Fedora to use .xchat-gnome, instead of .xchat2 Patch0: %{name}-0.23.92-config.patch +# Patch to fix pressing "enter" in the middle of editing channel topic. +# RH Bug #483839 +Patch1: xchat-topic-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -48,6 +51,7 @@ common settings will be included in the main user interface. . %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .config +%patch1 -p1 -b .topic %build @@ -136,6 +140,9 @@ fi %changelog +* Sun May 10 2009 Brian Pepple - 0.24.1-2 +- Add patch to fix topic entry bug. (#483839) + * Wed Nov 26 2008 Brian Pepple - 0.24.1-1 - Update to 0.24.1. - Update Source URL. diff --git a/xchat-topic-update.patch b/xchat-topic-update.patch new file mode 100644 index 0000000..8c912f1 --- /dev/null +++ b/xchat-topic-update.patch @@ -0,0 +1,28 @@ +diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c +index a7d1883..334a196 100644 +--- a/src/fe-gnome/topic-label.c ++++ b/src/fe-gnome/topic-label.c +@@ -267,8 +267,7 @@ topic_label_change_current (TopicLabel *label) + g_free (title); + + gchar *topic = priv->current->topic; +- GtkTextBuffer *buffer = gtk_text_buffer_new (NULL); +- gtk_text_view_set_buffer (GTK_TEXT_VIEW (entry), buffer); ++ GtkTextBuffer *buffer = gtk_text_view_get_buffer ( GTK_TEXT_VIEW (entry)); + g_signal_connect (G_OBJECT (buffer), "insert-text", G_CALLBACK (topic_entry_activate), dialog); + if (topic) { + gtk_text_buffer_set_text (buffer, topic, -1); +@@ -282,6 +281,12 @@ topic_label_change_current (TopicLabel *label) + gtk_widget_hide (dialog); + gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_NONE); + gchar *newtopic = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); ++ /* bz:536916 – Pressing "Enter" in the middle of editing channel topic truncates ++ * ignore "\n" aka enter key ++ */ ++ glong i, len = g_utf8_strlen (newtopic, -1); ++ for (i=0; i< len; i++) ++ if (newtopic[i]=='\n') newtopic[i]=' '; + priv->current->server->p_topic (priv->current->server, priv->current->channel, newtopic); + g_free (newtopic); + } + From aef19b3d67414a3264990e557661988371b415f4 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Mon, 22 Jun 2009 00:03:59 +0000 Subject: [PATCH 4/6] - Fix topic patch. --- xchat-gnome.spec | 5 ++++- xchat-topic-update.patch | 40 ++++++++++++++++------------------------ 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/xchat-gnome.spec b/xchat-gnome.spec index aba4990..6992b56 100644 --- a/xchat-gnome.spec +++ b/xchat-gnome.spec @@ -1,6 +1,6 @@ Name: xchat-gnome Version: 0.24.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -140,6 +140,9 @@ fi %changelog +* Sun Jun 21 2009 Brian Pepple - 0.24.1-3 +- Fix topic patch. + * Sun May 10 2009 Brian Pepple - 0.24.1-2 - Add patch to fix topic entry bug. (#483839) diff --git a/xchat-topic-update.patch b/xchat-topic-update.patch index 8c912f1..b572469 100644 --- a/xchat-topic-update.patch +++ b/xchat-topic-update.patch @@ -1,28 +1,20 @@ +From 6d1a939a14de918de4a79c010d82796f8035bcfa Mon Sep 17 00:00:00 2001 +From: Josselin Mouette <^Css@malsain.org> +Date: Thu, 18 Jun 2009 09:41:33 +0000 +Subject: Bug 536916 – Pressing "Enter" in the middle of editing channel topic truncates it. + +--- diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c -index a7d1883..334a196 100644 +index a7d1883..977d29c 100644 --- a/src/fe-gnome/topic-label.c +++ b/src/fe-gnome/topic-label.c -@@ -267,8 +267,7 @@ topic_label_change_current (TopicLabel *label) - g_free (title); - - gchar *topic = priv->current->topic; -- GtkTextBuffer *buffer = gtk_text_buffer_new (NULL); -- gtk_text_view_set_buffer (GTK_TEXT_VIEW (entry), buffer); -+ GtkTextBuffer *buffer = gtk_text_view_get_buffer ( GTK_TEXT_VIEW (entry)); - g_signal_connect (G_OBJECT (buffer), "insert-text", G_CALLBACK (topic_entry_activate), dialog); - if (topic) { - gtk_text_buffer_set_text (buffer, topic, -1); -@@ -282,6 +281,12 @@ topic_label_change_current (TopicLabel *label) - gtk_widget_hide (dialog); - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_NONE); - gchar *newtopic = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); -+ /* bz:536916 – Pressing "Enter" in the middle of editing channel topic truncates -+ * ignore "\n" aka enter key -+ */ -+ glong i, len = g_utf8_strlen (newtopic, -1); -+ for (i=0; i< len; i++) -+ if (newtopic[i]=='\n') newtopic[i]=' '; - priv->current->server->p_topic (priv->current->server, priv->current->channel, newtopic); - g_free (newtopic); +@@ -315,6 +315,7 @@ static void + topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog) + { + if (strncmp (text, "\n", len) == 0) { ++ g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text"); + gtk_dialog_response (dialog, GTK_RESPONSE_OK); } - + } +-- +cgit v0.8.2 From 37f335d80237470d0e363e26056200079ed21ae0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:43 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 032c409..02b1948 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xchat-gnome SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 798cf60c43b4361b47d466b4cbf821561f046efb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:35:37 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 02b1948..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xchat-gnome -# $Id$ -NAME := xchat-gnome -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10