- Update to to 2.2.5 (thanks to Matthew Luckie <mjl@luckie.org.nz> for testing on 4.x)

PR:		ports/79764
Submitted by:	maintainer

9 files changed, 52 insertions, 204 deletions

diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index ac1267250892..9f7ebc128607 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnugadu2
-PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTVERSION=	2.2.5
 CATEGORIES=	polish net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
@@ -19,6 +18,7 @@ COMMENT=	GTK2 based Gadu-Gadu client for X11
 LIB_DEPENDS=	gadu.3:${PORTSDIR}/polish/ekg \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
@@ -27,7 +27,7 @@ USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
-CONFLICTS=	qhacc-*
+CONFLICTS=	qhacc-[0-9]*
 
 CONFIGURE_ARGS=	\
 		--with-external-libgadu \
@@ -117,7 +117,9 @@ PLIST_SUB+=	KDE:="@comment "
 .endif
 
 pre-everything::
-.if defined(WITH_TLEN) || defined(WITH_JABBER) || defined(WITH_XOSD) || defined(WITH_DOCLET) || defined(WITH_DOCKAPP) || defined(WITH_ARTS) || defined(WITH_ESOUND) || defined(WITH_GTKSPELL)
+.if defined(WITH_TLEN) || defined(WITH_JABBER) || defined(WITH_XOSD) || \
+	defined(WITH_DOCKLET) || defined(WITH_DOCKAPP) || defined(WITH_GTKSPELL) || \
+	defined(WITH_ARTS) || defined(WITH_ESOUND)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  You can define following build options:"
 	@${ECHO_MSG}
diff --git a/polish/gnugadu2/distinfo b/polish/gnugadu2/distinfo
index 4fd9b676f44b..b464088f5d1f 100644
--- a/polish/gnugadu2/distinfo
+++ b/polish/gnugadu2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gg2-2.2.4.tar.gz) = 3f9c87ac78bb23b4cd07a4b6eb380cf8
-SIZE (gg2-2.2.4.tar.gz) = 1363001
+MD5 (gg2-2.2.5.tar.bz2) = 9eff427afebf00e7a17350846775effd
+SIZE (gg2-2.2.5.tar.bz2) = 1087478
diff --git a/polish/gnugadu2/files/patch-contrib-gghist-gghist.c b/polish/gnugadu2/files/patch-contrib-gghist-gghist.c
deleted file mode 100644
index 9f83d65d8ded..000000000000
--- a/polish/gnugadu2/files/patch-contrib-gghist-gghist.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- contrib/gghist/gghist.c.orig	Fri Aug 20 14:17:29 2004
-+++ contrib/gghist/gghist.c	Fri Jan 28 00:54:48 2005
-@@ -244,6 +244,7 @@
- 	GtkWidget *field_s;
- 	GtkWidget *base_field;
- 	GtkTextBuffer *buf;
-+	int fd;
- 
- 	gtk_init(&argc, &argv);
- 
-@@ -257,7 +258,7 @@
- #ifdef GGADU_DEBUG
- 	g_print("Trying to open a file..\n");
- #endif
--	int fd = open(argv[1], O_RDONLY);
-+	fd = open(argv[1], O_RDONLY);
- 
- 	if (fd == -1) {
- 		GtkWidget *dialog;
-@@ -279,6 +280,7 @@
- 	g_print("Getting lines count..\n");
- #endif
- 	lines = lines_count(fd);
-+	{
- 	int list[lines + 2];
- 
- 
-@@ -326,7 +328,6 @@
- 	/* Add 'Base container' to window */
- 	gtk_container_add(GTK_CONTAINER(window), base_field);
- 
--
- 	list[lines + 2] = fd;
- #ifdef GGADU_DEBUG
- 	g_print("Reading offsets of lines..%d\n", lines);
-@@ -344,6 +345,7 @@
- 	else
- 	    show_lines(0, display_pages, list);
- 
-+	}
- 	gtk_widget_show_all(window);
- 
- 	gtk_main();
diff --git a/polish/gnugadu2/files/patch-src-plugins-GUI-gui_chat.c b/polish/gnugadu2/files/patch-src-plugins-GUI-gui_chat.c
deleted file mode 100644
index a61020e88a15..000000000000
--- a/polish/gnugadu2/files/patch-src-plugins-GUI-gui_chat.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/plugins/GUI/gui_chat.c.orig	Mon Jan  3 16:51:02 2005
-+++ src/plugins/GUI/gui_chat.c	Fri Jan 28 00:23:27 2005
-@@ -249,6 +249,7 @@
- 
- void on_clear_clicked(GtkWidget * button, gpointer user_data)
- {
-+	GtkTextBuffer *buf;
- 	gint chat_type = (gint) ggadu_config_var_get(gui_handler, "chat_type");
- 	gui_chat_session *session = NULL;
- 	GtkWidget *textview = NULL;
-@@ -267,7 +268,7 @@
- 		textview = g_object_get_data(G_OBJECT(session->chat), "history");
- 	}
- 
--	GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
-+	buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
- 	gtk_text_buffer_set_text(buf, "", -1);
- }
- 
diff --git a/polish/gnugadu2/files/patch-src-plugins-GUI-gui_preferences.c b/polish/gnugadu2/files/patch-src-plugins-GUI-gui_preferences.c
deleted file mode 100644
index f8a6d697258c..000000000000
--- a/polish/gnugadu2/files/patch-src-plugins-GUI-gui_preferences.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/plugins/GUI/gui_preferences.c.orig	Tue Jan  4 16:54:23 2005
-+++ src/plugins/GUI/gui_preferences.c	Fri Jan 28 00:32:36 2005
-@@ -618,6 +618,8 @@
- #endif
- 	GtkWidget *label0_align, *label1_align, *label2_align;
- 	GtkWidget *label3_align;
-+	GtkWidget *exp;
-+	GtkWidget *frm;
- 
- 	chat_vbox = gtk_vbox_new(FALSE, 5);
- 
-@@ -694,8 +696,8 @@
- 	gtk_table_set_row_spacings(GTK_TABLE(tabbox), 7);
- 	gtk_table_set_col_spacings(GTK_TABLE(tabbox), 0);
- 	
--	GtkWidget *exp = gtk_expander_new(_("More advanced options"));
--	GtkWidget *frm = gtk_frame_new(_("Default size of window"));
-+	exp = gtk_expander_new(_("More advanced options"));
-+	frm = gtk_frame_new(_("Default size of window"));
- 	gtk_frame_set_shadow_type(GTK_FRAME(frm),GTK_SHADOW_ETCHED_OUT);
- 	gtk_container_add(GTK_CONTAINER(frm), tabbox);
- 	gtk_container_add(GTK_CONTAINER(exp), frm);
-@@ -746,6 +748,7 @@
- 
- static GtkWidget *create_advanced_tab()
- {
-+	GtkWidget *entry;
- 	GtkWidget *hide_on_start;
- 	GtkWidget *close_on_esc;
- 	GtkWidget *blink_interval = NULL;
-@@ -922,7 +925,7 @@
- 	label = gtk_label_new(_("Web Browser:"));
- 	gtk_container_add(GTK_CONTAINER(label4_align), label);
- 
--	GtkWidget *entry = gtk_entry_new();
-+	entry = gtk_entry_new();
- 	gtk_table_attach_defaults(GTK_TABLE(tabbox2), label4_align, 0, 1, 0, 1);
- 	gtk_table_attach_defaults(GTK_TABLE(tabbox2), entry, 1, 2, 0, 1);
- 	g_object_set_data(G_OBJECT(adv_vbox), "browser_exec", entry);
-@@ -1221,6 +1224,8 @@
- 	response = gtk_dialog_run(GTK_DIALOG(preferences));
- 	if (response == GTK_RESPONSE_ACCEPT)
- 	{
-+		GSList *combo_theme_slist;
-+		GSList *combo_icons_slist;
- 		if (plugins_updated)
- 		{
- 			GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
-@@ -1325,7 +1330,7 @@
- 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_theme");
- 		g_return_if_fail(entry != NULL);
- 
--		GSList *combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
-+		combo_theme_slist = g_object_get_data(G_OBJECT(entry), "combo_theme_slist");
- 		ggadu_config_var_set(gui_handler, "theme", (gpointer) g_strdup(g_slist_nth_data(combo_theme_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
- 
- 		g_slist_foreach(combo_theme_slist, (GFunc) g_free, NULL);
-@@ -1333,7 +1338,7 @@
- 
- 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_icons");
- 		g_return_if_fail(entry != NULL);
--		GSList *combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
-+		combo_icons_slist = g_object_get_data(G_OBJECT(entry), "combo_icons_slist");
- 		ggadu_config_var_set(gui_handler, "icons", (gpointer) g_strdup(g_slist_nth_data(combo_icons_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
- 		g_slist_free(combo_icons_slist);
- 
diff --git a/polish/gnugadu2/files/patch-src-plugins-gadu_gadu_plugin.c b/polish/gnugadu2/files/patch-src-plugins-gadu_gadu_plugin.c
deleted file mode 100644
index 449ae24aabb0..000000000000
--- a/polish/gnugadu2/files/patch-src-plugins-gadu_gadu_plugin.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/plugins/gadu_gadu/gadu_gadu_plugin.c.orig	Tue Jan  4 09:51:43 2005
-+++ src/plugins/gadu_gadu/gadu_gadu_plugin.c	Fri Jan 28 00:39:28 2005
-@@ -422,6 +422,9 @@
- 	uint32_t *uins;
- 	GGaduMsg *msg = NULL;
- 	gint i, j;
-+	GSList *list;
-+	GSList *us;
-+	gchar *recipients_line = NULL;
- 
- 	/* w przypadku bledu/utraty polaczenia postap tak jak w przypadku disconnect */
- 	if (!session || !(e = gg_watch_fd(session)) || (condition & G_IO_ERR) ||
-@@ -585,9 +588,8 @@
- 
- 		}
- 
--		GSList *list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
--		GSList *us = list;
--		gchar *recipients_line = NULL;
-+		list = ggadu_repo_get_as_slist("gadu-gadu", REPO_VALUE_CONTACT);
-+		us = list;
- 
- 		while (us)
- 		{
-@@ -696,6 +698,7 @@
- 
- 				if (k)
- 				{
-+					gchar *status = NULL;
- 					ip_addr.s_addr = n->remote_ip;
- 					if (inet_ntoa(ip_addr) && (ggadu_strcasecmp(inet_ntoa(ip_addr), "0.0.0.0")))
- 					{
-@@ -714,7 +717,6 @@
- 
- 					/* Zapiszmy sobie zmiane opisu do pliku historii */
- 
--					gchar *status = NULL;
- 					if ((k->status == GG_STATUS_AVAIL) || (k->status == GG_STATUS_AVAIL_DESCR))
- 						status = g_strdup_printf("avail");
- 					else if ((k->status == GG_STATUS_BUSY) || (k->status == GG_STATUS_BUSY_DESCR))
diff --git a/polish/gnugadu2/files/patch-src-plugins-ignore-ignore.c b/polish/gnugadu2/files/patch-src-plugins-ignore-ignore.c
deleted file mode 100644
index 8c97021e430b..000000000000
--- a/polish/gnugadu2/files/patch-src-plugins-ignore-ignore.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/plugins/ignore/ignore.c.orig	Mon Dec 27 10:44:34 2004
-+++ src/plugins/ignore/ignore.c	Fri Jan 28 00:41:57 2005
-@@ -102,10 +102,11 @@
- 				{
- 				case GGADU_IGNORE_ADD_ID:
- 					{
-+						gchar *ignored_list_prev;
-+						gchar *ignored_list_after = NULL;
- 						GGaduContact *k = g_new0(GGaduContact, 1);
- 						k->id = g_strdup(kv->value);
--						gchar *ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
--						gchar *ignored_list_after = NULL;
-+						ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
- 
- 						ignored_list_after = ggadu_add_ignored_contact(ignored_list_prev, k);
- 						if (ignored_list_after)
-@@ -142,10 +143,11 @@
- 				{
- 				case GGADU_IGNORE_REMOVE_ID:
- 					{
-+						gchar *ignored_list_prev;
-+						gchar *ignored_list_after = NULL;
- 						GGaduContact *k = g_new0(GGaduContact, 1);
- 						k->id = g_strdup(kv->value);
--						gchar *ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
--						gchar *ignored_list_after = NULL;
-+						ignored_list_prev = ggadu_config_var_get(ignore_handler, "list");
- 
- 						ignored_list_after = ggadu_remove_ignored_contact(ignored_list_prev, k);
- 						if (ignored_list_after)
diff --git a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c
new file mode 100644
index 000000000000..f0d14a832aba
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__chat.c
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- src/plugins/GUI/gui_chat.c.orig
++++ src/plugins/GUI/gui_chat.c
+@@ -851,6 +851,7 @@
+ 	gint percent = 0;
+ 	gint number_of_workspaces = 0;
+ 	GtkWidget *chat_notebook_paned_size = NULL;
++	PangoFontDescription *font_desc;
+ 
+ 	if (!session || !plugin_name || !id)
+ 		return NULL;
+@@ -1117,7 +1118,6 @@
+ 
+     /* set font of the message editing text_view */
+ 
+-    PangoFontDescription *font_desc;
+     fontstr = ggadu_config_var_get(gui_handler, "msg_out_edit_font");
+     font_desc = pango_font_description_from_string (fontstr);
+     gtk_widget_modify_font (input, font_desc);
diff --git a/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c
new file mode 100644
index 000000000000..ee388808ef6d
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src_plugins_GUI_gui__preferences.c
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/plugins/GUI/gui_preferences.c.orig
++++ src/plugins/GUI/gui_preferences.c
+@@ -1315,6 +1315,8 @@
+ 	{
+ 		GSList *combo_theme_slist;
+ 		GSList *combo_icons_slist;
++		GSList *combo_skins_slist;
++
+ 		if (plugins_updated)
+ 		{
+ 			GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
+@@ -1433,7 +1435,7 @@
+ 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_skins");
+ 		g_return_if_fail(entry != NULL);
+ 
+-		GSList *combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
++		combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
+ 
+ 		if (gtk_combo_box_get_active(GTK_COMBO_BOX(entry))) {
+ 		    ggadu_config_var_set(gui_handler, "skin", (gpointer) g_strdup(g_slist_nth_data(combo_skins_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));