aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net-im/kf/Makefile7
-rw-r--r--net-im/kf/distinfo5
-rw-r--r--net-im/kf/files/patch-configure11
-rw-r--r--net-im/kf/files/patch-src__jispman.c34
-rw-r--r--net-im/kf/files/patch-src__muc.c21
-rw-r--r--net-im/kf/files/patch-src__muc_join.c25
-rw-r--r--net-im/kf/files/patch-src__settings_icons.c58
-rw-r--r--net-im/kf/pkg-plist17
8 files changed, 165 insertions, 13 deletions
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index 04665debda14..b5331accd336 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -6,12 +6,9 @@
#
PORTNAME= kf
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.5.4.1
CATEGORIES= net-im
-MASTER_SITES= http://www.habazie.rams.pl/kf/files/ \
- http://www.jabberstudio.org/projects/kf/releases/ \
- http://santinel.bas-net.by/files/
+MASTER_SITES= http://files.jabberstudio.org/kf/
MAINTAINER= anrays@gmail.com
COMMENT= A simple Jabber client using the GTK+ 2.0 toolkit
diff --git a/net-im/kf/distinfo b/net-im/kf/distinfo
index 4b1399dfd5d1..7017ad717502 100644
--- a/net-im/kf/distinfo
+++ b/net-im/kf/distinfo
@@ -1,2 +1,3 @@
-MD5 (kf-0.4.tar.gz) = d21d7622dbec870bd10f367e5ef5a195
-SIZE (kf-0.4.tar.gz) = 363208
+MD5 (kf-0.5.4.1.tar.gz) = f963f289b7a1221f192a540fbda5cd55
+SHA256 (kf-0.5.4.1.tar.gz) = 70068af405b4a18c84babded6a1d3fee1b87687d725c1c0456570f06c3841ef3
+SIZE (kf-0.5.4.1.tar.gz) = 512040
diff --git a/net-im/kf/files/patch-configure b/net-im/kf/files/patch-configure
new file mode 100644
index 000000000000..f3b6176cedf7
--- /dev/null
+++ b/net-im/kf/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.old Thu Nov 24 19:50:09 2005
++++ configure Thu Nov 24 19:51:04 2005
+@@ -4060,7 +4060,7 @@
+
+ MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16"
+
+-if test "x$enable_gtkspell" == "xyes"
++if test "x$enable_gtkspell" = "xyes"
+ then
+
+ succeeded=no
diff --git a/net-im/kf/files/patch-src__jispman.c b/net-im/kf/files/patch-src__jispman.c
new file mode 100644
index 000000000000..c50d447ce4d0
--- /dev/null
+++ b/net-im/kf/files/patch-src__jispman.c
@@ -0,0 +1,34 @@
+--- src/jispman.c.orig Sun Apr 10 13:03:54 2005
++++ src/jispman.c Thu Nov 24 23:08:21 2005
+@@ -162,13 +162,14 @@
+ **/
+ KfJisp *kf_jisp_manager_get_jisp_for_jid (KfJispManager *jispman, const gchar *jid)
+ {
++ GList *tmp;
++ KfJispPattern *pattern;
++
+ g_return_val_if_fail (jispman, NULL);
+ g_return_val_if_fail (jid, NULL);
+
+- GList *tmp;
+-
+ for (tmp = jispman->patterns; tmp; tmp = tmp->next) {
+- KfJispPattern *pattern = tmp->data;
++ pattern = tmp->data;
+
+ if (g_pattern_match_string (pattern->gpat, jid))
+ return pattern->jisp;
+@@ -188,10 +189,12 @@
+ **/
+ KfJispPattern *kf_jisp_pattern_new (const gchar *pattern, KfJisp *jisp)
+ {
++ KfJispPattern *pat;
++
+ g_return_val_if_fail (pattern, NULL);
+ g_return_val_if_fail (jisp, NULL);
+
+- KfJispPattern *pat = g_new0 (KfJispPattern, 1);
++ pat = g_new0 (KfJispPattern, 1);
+ pat->pattern = g_strdup (pattern);
+ pat->jisp = kf_jisp_ref (jisp);
+ pat->gpat = g_pattern_spec_new (pattern);
diff --git a/net-im/kf/files/patch-src__muc.c b/net-im/kf/files/patch-src__muc.c
new file mode 100644
index 000000000000..787dfb929af1
--- /dev/null
+++ b/net-im/kf/files/patch-src__muc.c
@@ -0,0 +1,21 @@
+--- src/muc.c.orig Thu Nov 24 23:32:00 2005
++++ src/muc.c Thu Nov 24 23:34:10 2005
+@@ -1807,13 +1807,16 @@
+
+
+ static void kf_muc_close (KfMUC *self) {
+- GtkWidget *win = gtk_message_dialog_new (GTK_WINDOW (self->window),
++ GtkWidget *win;
++ gint response;
++
++ win = gtk_message_dialog_new (GTK_WINDOW (self->window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_OK_CANCEL,
+ _("Are you sure you want to leave this conference?"));
+ gtk_dialog_set_default_response (GTK_DIALOG (win), GTK_RESPONSE_CANCEL);
+- gint response = gtk_dialog_run (GTK_DIALOG (win));
++ response = gtk_dialog_run (GTK_DIALOG (win));
+ gtk_widget_destroy (win);
+ if (response == GTK_RESPONSE_OK)
+ gtk_widget_destroy (self->window);
diff --git a/net-im/kf/files/patch-src__muc_join.c b/net-im/kf/files/patch-src__muc_join.c
new file mode 100644
index 000000000000..5c5380ed0a0b
--- /dev/null
+++ b/net-im/kf/files/patch-src__muc_join.c
@@ -0,0 +1,25 @@
+--- src/muc_join.c.orig Thu Nov 24 23:39:22 2005
++++ src/muc_join.c Thu Nov 24 23:40:29 2005
+@@ -294,6 +294,9 @@
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ gint n_selected;
++ GList *list;
++ GtkTreePath *path;
++ KfPrefMUCBookmark *bookmark;
+
+ n_selected = gtk_tree_selection_count_selected_rows (selection);
+ self->multiple = (n_selected > 1);
+@@ -303,10 +306,9 @@
+
+ if (n_selected == 1) {
+ // if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+- GList *list = gtk_tree_selection_get_selected_rows (selection, &model);
+- GtkTreePath *path = list->data;
++ list = gtk_tree_selection_get_selected_rows (selection, &model);
++ path = list->data;
+ gtk_tree_model_get_iter (model, &iter, path);
+- KfPrefMUCBookmark *bookmark;
+ gtk_tree_model_get (model, &iter, 0, &bookmark, -1);
+
+ if (bookmark->server)
diff --git a/net-im/kf/files/patch-src__settings_icons.c b/net-im/kf/files/patch-src__settings_icons.c
new file mode 100644
index 000000000000..b3affa33f152
--- /dev/null
+++ b/net-im/kf/files/patch-src__settings_icons.c
@@ -0,0 +1,58 @@
+--- src/settings_icons.c.orig Thu Nov 24 23:44:55 2005
++++ src/settings_icons.c Thu Nov 24 23:47:11 2005
+@@ -53,6 +53,7 @@
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *select;
++ GtkTreeIter iter;
+
+ tv = glade_xml_get_widget (glade, "icons_treeview");
+ if ((model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv)))) {
+@@ -98,7 +99,6 @@
+ foo_debug ("evil things happen!\n");
+ }
+
+- GtkTreeIter iter;
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ 0, _("Default icon set"),
+@@ -152,6 +152,10 @@
+ static void install_cb (GtkWidget *button, GtkListStore *store) {
+ GtkWidget *win;
+ gint response;
++ GtkFileFilter *filter;
++ gchar *filename;
++ KfJisp *jisp;
++ GtkTreeIter iter;
+
+ #if GTK_CHECK_VERSION(2,4,0)
+ win = gtk_file_chooser_dialog_new (_("Select icon set file to open"),
+@@ -160,7 +164,7 @@
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ NULL);
+- GtkFileFilter *filter = gtk_file_filter_new ();
++ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Jabber icon sets"));
+ gtk_file_filter_add_pattern (filter, "*.jisp");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (win), filter);
+@@ -175,18 +179,15 @@
+ response = gtk_dialog_run (GTK_DIALOG (win));
+ if (response == GTK_RESPONSE_OK) {
+ #if GTK_CHECK_VERSION(2,4,0)
+- gchar *filename;
+- KfJisp *jisp;
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (win));
+ jisp = kf_jisp_install (filename);
+ g_free (filename);
+ #else
+- KfJisp *jisp = kf_jisp_install (
++ jisp = kf_jisp_install (
+ gtk_file_selection_get_filename (GTK_FILE_SELECTION (win)));
+ #endif
+
+ if (jisp) {
+- GtkTreeIter iter;
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ 0, jisp->name,
diff --git a/net-im/kf/pkg-plist b/net-im/kf/pkg-plist
index ee7b7ed26c1f..6fd57fe6f08b 100644
--- a/net-im/kf/pkg-plist
+++ b/net-im/kf/pkg-plist
@@ -26,6 +26,7 @@ bin/kf
%%DATADIR%%/chat.glade
%%DATADIR%%/chat.glade.h
%%DATADIR%%/chat.png
+%%DATADIR%%/contacts.glade
%%DATADIR%%/dnd.png
%%DATADIR%%/dock.glade
%%DATADIR%%/dock.glade.h
@@ -91,10 +92,16 @@ bin/kf
%%DATADIR%%/new_account.glade.h
%%DATADIR%%/online.png
%%DATADIR%%/password.png
+%%DATADIR%%/people16.png
+%%DATADIR%%/people24.png
%%DATADIR%%/pix_chat.png
%%DATADIR%%/pix_message.png
%%DATADIR%%/pix_system.png
%%DATADIR%%/plus.png
+%%DATADIR%%/privacy.glade
+%%DATADIR%%/privacy.glade.h
+%%DATADIR%%/privacy_list.glade
+%%DATADIR%%/privacy_list.glade.h
%%DATADIR%%/register.glade
%%DATADIR%%/register.glade.h
%%DATADIR%%/search.glade
@@ -107,18 +114,16 @@ bin/kf
%%DATADIR%%/unavailable.png
%%DATADIR%%/unavailable_desc.png
%%DATADIR%%/unknown.png
+%%DATADIR%%/vcard.png
%%DATADIR%%/vcard.glade
%%DATADIR%%/vcard.glade.h
%%DATADIR%%/www.png
%%DATADIR%%/xa.png
+share/applications/kf.desktop
share/locale/bg/LC_MESSAGES/kf.mo
share/locale/pl/LC_MESSAGES/kf.mo
share/locale/ru/LC_MESSAGES/kf.mo
-@dirrm share/locale/bg/LC_MESSAGES
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/bg
-@dirrm share/locale/pl
-@dirrm share/locale/ru
+share/pixmaps/kf.png
@dirrm %%DATADIR%%/emoticons
@dirrm %%DATADIR%%
+@unexec rmdir %D/share/applications 2> /dev/null || true