share/gnome/ -> share/.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9356 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 329 insertions, 0 deletions

diff --git a/net-im/gaim-openq/files/patch-intl_Makefile.in b/net-im/gaim-openq/files/patch-intl_Makefile.in
new file mode 100644
index 000000000..ab2927595
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-intl_Makefile.in
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig	Tue Oct 12 22:43:15 2004
++++ intl/Makefile.in	Tue Oct 12 22:44:57 2004
+@@ -40,7 +40,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ 
diff --git a/net-im/gaim-openq/files/patch-src-file_trans.c b/net-im/gaim-openq/files/patch-src-file_trans.c
new file mode 100644
index 000000000..01da2c190
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-file_trans.c
@@ -0,0 +1,96 @@
+--- src/file_trans.c.orig	Thu Aug 18 19:21:53 2005
++++ src/file_trans.c	Thu Aug 18 19:33:01 2005
+@@ -26,6 +26,9 @@
+ #define random rand
+ #endif
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++
+ #include "debug.h"		// gaim_debug
+ #include "ft.h"			// gaim_xfer
+ #include "md5.h"
+@@ -213,8 +216,8 @@
+ int _qq_xfer_open_file(const gchar *filename, const gchar *method, GaimXfer *xfer)
+ {
+ 	ft_info *info = xfer->data;
+-	info->dest_fp = fopen(gaim_xfer_get_local_filename(xfer), method);
+-	if (info->dest_fp == NULL) {
++	info->un.dest_fp = fopen(gaim_xfer_get_local_filename(xfer), method);
++	if (info->un.dest_fp == NULL) {
+ 		return -1;
+ 	}
+ 	return 0;
+@@ -225,26 +228,28 @@
+ {
+ 	ft_info *info = xfer->data;
+ 
+-	fseek(info->dest_fp, index * len, SEEK_SET);
+-	return fread(buffer, 1, len, info->dest_fp);
++	fseek(info->un.dest_fp, index * len, SEEK_SET);
++	return fread(buffer, 1, len, info->un.dest_fp);
+ }
+ 
+ gint
+ _qq_xfer_write_file(guint8 *buffer, guint index, guint len, GaimXfer *xfer)
+ {
+ 	ft_info *info = xfer->data;
+-	fseek(info->dest_fp, index * len, SEEK_SET);
+-	return fwrite(buffer, 1, len, info->dest_fp);
++	fseek(info->un.dest_fp, index * len, SEEK_SET);
++	return fwrite(buffer, 1, len, info->un.dest_fp);
+ }
+ 
+ void qq_xfer_close_file(GaimXfer *xfer)
+ {
+ 	ft_info *info = xfer->data;
+ 
+-	if (info->dest_fp) fclose(info->dest_fp);
++	if (info->un.dest_fp) fclose(info->un.dest_fp);
+ }
+ #endif
+ 
++ssize_t _qq_xfer_write(const char *buf, size_t len, GaimXfer *xfer);
++
+ gint _qq_send_file(GaimConnection *gc, guint8 *data, gint len, guint16 packet_type, guint32 to_uid)
+ {
+ 	gint bytes;
+@@ -270,7 +275,6 @@
+ 	bytes += create_packet_dw(buf, &cursor, _encrypt_qq_uid(to_uid, file_key));
+ 	bytes += create_packet_data(buf, &cursor, data, len);
+ 
+-	ssize_t _qq_xfer_write(const char *buf, size_t len, GaimXfer *xfer);
+ 	if (bytes == len + 12) {
+ 		//gaim_xfer_write(qd->xfer, buf, bytes);
+ 		_qq_xfer_write(buf, bytes, qd->xfer);
+@@ -397,10 +401,11 @@
+ 	gchar file_md5[16], filename_md5[16], *filename;
+ 	gint filename_len, filesize;
+ 	qq_data *qd;
++	ft_info *info;
+ 
+ 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+ 	qd = (qq_data *) gc->proto_data;
+-	ft_info *info = (ft_info *) qd->xfer->data;
++	info = (ft_info *) qd->xfer->data;
+ 
+ 	filename = (gchar *) gaim_xfer_get_filename(qd->xfer);
+ 	filesize = gaim_xfer_get_size(qd->xfer);
+@@ -669,6 +674,8 @@
+ 	GaimXfer *xfer = qd->xfer;
+ 	ft_info *info = (ft_info *) xfer->data;
+ 	guint32 mask;
++	guint8 *buffer;
++	gint readbytes;
+ 
+ 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "receiving %dth fragment ack, slide window status %o, max_fragment_index %d\n", 
+ 			fragment_index, info->window, info->max_fragment_index);
+@@ -698,8 +705,6 @@
+ 		{
+ 			//move the slide window
+ 			info->window &= ~mask;
+-			guint8 *buffer;
+-			gint readbytes;
+ 
+ 			buffer = g_newa(guint8, info->fragment_len);
+ 			readbytes = _qq_xfer_read_file(buffer, info->max_fragment_index + sizeof(info->window), 
diff --git a/net-im/gaim-openq/files/patch-src-group_admindlg.c b/net-im/gaim-openq/files/patch-src-group_admindlg.c
new file mode 100644
index 000000000..2198661f9
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-group_admindlg.c
@@ -0,0 +1,65 @@
+--- src/group_admindlg.c.orig	Sat Oct  2 17:48:11 2004
++++ src/group_admindlg.c	Sat Oct 16 17:44:20 2004
+@@ -133,6 +133,17 @@
+ 	GaimConnection *gc;
+ 	qun_info_window *info_window;
+ 
++	gint page, group_category, i = 0;
++	qq_group *group;
++	qq_data *qd;
++	GtkTextIter start, end;
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	GValue value = { 0, };
++	guint32 *new_members;
++	guint32 uid;
++	gboolean selected;
++
+ 	g_return_if_fail(data != NULL);
+ 	info_window = (qun_info_window *) data;
+ 
+@@ -145,17 +156,6 @@
+ //                        _("This version of GTK-2 does not support this function"), NULL);
+ //        return;
+ //#else
+-	gint page, group_category, i = 0;
+-	qq_group *group;
+-	qq_data *qd;
+-	GtkTextIter start, end;
+-	GtkTreeModel *model;
+-	GtkTreeIter iter;
+-	GValue value = { 0, };
+-	guint32 *new_members;
+-	guint32 uid;
+-	gboolean selected;
+-
+ 	qd = (qq_data *) gc->proto_data;
+ 
+ 	// we assume the modification can succeed
+@@ -253,6 +253,12 @@
+ 	GaimConnection *gc;
+ 	qq_group *group;
+ 
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	GtkTreePath *path;
++	gboolean selected;
++	guint32 uid;
++
+ 	info_window = (qun_info_window *) data;
+ 	g_return_if_fail(info_window != NULL);
+ 
+@@ -262,11 +268,8 @@
+ 	group = qq_group_find_by_internal_group_id(gc, info_window->internal_group_id);
+ 	g_return_if_fail(group != NULL);
+ 
+-	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(info_window->tre_members));
+-	GtkTreeIter iter;
+-	GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+-	gboolean selected;
+-	guint32 uid;
++	model = gtk_tree_view_get_model(GTK_TREE_VIEW(info_window->tre_members));
++	path = gtk_tree_path_new_from_string(path_str);
+ 
+ 	gtk_tree_model_get_iter(model, &iter, path);
+ 	gtk_tree_model_get(model, &iter, COLUMN_SELECTED, &selected, -1);
diff --git a/net-im/gaim-openq/files/patch-src-group_im.c b/net-im/gaim-openq/files/patch-src-group_im.c
new file mode 100644
index 000000000..6e09b247d
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-group_im.c
@@ -0,0 +1,19 @@
+--- src/group_im.c.orig	Sat Oct  2 17:48:11 2004
++++ src/group_im.c	Sat Oct 16 17:59:51 2004
+@@ -59,6 +59,7 @@
+ 	guint8 *raw_data, *cursor;
+ 	guint16 msg_len;
+ 	gchar *msg_filtered;
++	guint8 *send_im_tail;
+ 
+ 	g_return_if_fail(gc != NULL && group != NULL && msg != NULL);
+ 
+@@ -73,7 +74,7 @@
+ 	bytes += create_packet_dw(raw_data, &cursor, group->internal_group_id);
+ 	bytes += create_packet_w(raw_data, &cursor, msg_len + QQ_SEND_IM_AFTER_MSG_LEN);
+ 	bytes += create_packet_data(raw_data, &cursor, (gchar *) msg_filtered, msg_len);
+-	guint8 *send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL,
++	send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL,
+ 						   FALSE, FALSE, FALSE,
+ 						   QQ_SEND_IM_AFTER_MSG_LEN);
+ 	bytes += create_packet_data(raw_data, &cursor, (gchar *) send_im_tail, QQ_SEND_IM_AFTER_MSG_LEN);
diff --git a/net-im/gaim-openq/files/patch-src-im.c b/net-im/gaim-openq/files/patch-src-im.c
new file mode 100644
index 000000000..3855b2a64
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-im.c
@@ -0,0 +1,28 @@
+--- src/im.c.orig	Sat Oct  2 17:48:11 2004
++++ src/im.c	Sat Oct 16 18:06:57 2004
+@@ -435,6 +435,8 @@
+ 	gchar *font_size = NULL, *font_color = NULL, *font_name = NULL, *tmp;
+ 	gboolean is_bold = FALSE, is_italic = FALSE, is_underline = FALSE;
+ 	const gchar *start, *end, *last;
++	guint font_name_len, tail_len;
++	guint8 *send_im_tail;
+ 
+ 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+ 
+@@ -488,7 +490,6 @@
+ 	now = time(NULL);
+ 	md5 = _gen_session_md5(qd->uid, qd->session_key);
+ 
+-	guint font_name_len, tail_len;
+ 	font_name_len = (font_name) ? strlen(font_name) : DEFAULT_FONT_NAME_LEN;
+ 	tail_len = font_name_len + QQ_SEND_IM_AFTER_MSG_HEADER_LEN + 1;
+ 
+@@ -530,7 +531,7 @@
+ 	bytes += create_packet_b(raw_data, &cursor, type);
+ 	//053-   : msg ends with 0x00
+ 	bytes += create_packet_data(raw_data, &cursor, msg_filtered, msg_len);
+-	guint8 *send_im_tail = qq_get_send_im_tail(font_color, font_size, font_name, is_bold,
++	send_im_tail = qq_get_send_im_tail(font_color, font_size, font_name, is_bold,
+ 						   is_italic, is_underline, tail_len);
+ 	_qq_show_packet("QQ_MESG debug", send_im_tail, tail_len);
+ 	bytes += create_packet_data(raw_data, &cursor, (gchar *) send_im_tail, tail_len);
diff --git a/net-im/gaim-openq/files/patch-src-recv_core.c b/net-im/gaim-openq/files/patch-src-recv_core.c
new file mode 100644
index 000000000..4a61450e9
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-recv_core.c
@@ -0,0 +1,11 @@
+--- src/recv_core.c.orig	Sat Oct  2 17:48:12 2004
++++ src/recv_core.c	Sat Oct 16 18:17:35 2004
+@@ -290,7 +290,7 @@
+ void qq_input_pending(gpointer data, gint source, GaimInputCondition cond)
+ {
+ 	GaimConnection *gc;
+-	qq_data *qd;;
++	qq_data *qd;
+ 	guint8 *buf;
+ 	gint len;
+ 
diff --git a/net-im/gaim-openq/files/patch-src-send_file.c b/net-im/gaim-openq/files/patch-src-send_file.c
new file mode 100644
index 000000000..e585f555e
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-send_file.c
@@ -0,0 +1,56 @@
+--- src/send_file.c.orig	Thu Dec 23 18:22:22 2004
++++ src/send_file.c	Thu Aug 18 18:18:11 2005
+@@ -22,6 +22,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <network.h>
+ 
+ #include "send_file.h"
+@@ -203,8 +205,8 @@
+ 	info = (ft_info *) xfer->data;
+ 
+ 	qq_xfer_close_file(xfer);
+-	if (info->dest_fp != NULL) {
+-		fclose(info->dest_fp);
++	if (info->un.dest_fp != NULL) {
++		fclose(info->un.dest_fp);
+ 		gaim_debug(GAIM_DEBUG_INFO, "QQ", "file closed\n");
+ 	}
+ 	if (info->major_fd != 0) {
+@@ -499,6 +501,8 @@
+ 	guint8 *cursor, *raw_data;
+ 	gint packet_len, bytes;
+ 	ft_info *info;
++	guint16 minor_port;
++	guint32 real_ip;
+ 
+ 	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+ 	qd = (qq_data *) gc->proto_data;
+@@ -506,8 +510,6 @@
+ 
+ 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "I've accepted the file transfer request from %d\n", to_uid);
+ 	_qq_xfer_init_socket(qd->xfer);
+-	guint16 minor_port;
+-	guint32 real_ip;
+ 
+ 	packet_len = 79;
+ 	raw_data = g_newa (guint8, packet_len);
+@@ -809,6 +811,7 @@
+ 	GaimXfer *xfer;
+ 	gchar *sender_name;
+ 	ft_info *info;
++	gchar **fileinfo;
+ 
+ 	g_return_if_fail (gc != NULL && data != NULL && data_len != 0);
+ 	qd = (qq_data *) gc->proto_data;
+@@ -834,7 +837,6 @@
+ 			GAIM_XFER_RECEIVE,
+ 			sender_name);
+ 
+-	gchar **fileinfo;
+ 	fileinfo = g_strsplit(data + 81 + 12, "\x1f", 2);
+ 	g_return_if_fail (fileinfo != NULL && fileinfo[0] != NULL && fileinfo[1] != NULL);
+ 	gaim_xfer_set_filename(xfer, fileinfo[0]);
diff --git a/net-im/gaim-openq/files/patch-src-send_file.h b/net-im/gaim-openq/files/patch-src-send_file.h
new file mode 100644
index 000000000..961316f49
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-send_file.h
@@ -0,0 +1,11 @@
+--- src/send_file.h.orig	Thu Aug 18 18:49:04 2005
++++ src/send_file.h	Thu Aug 18 17:55:56 2005
+@@ -40,7 +40,7 @@
+ 	union {
+ 		FILE *dest_fp;
+ 		guint8 *buffer;
+-	};
++	} un;
+ 	gboolean use_major;
+ } ft_info;
+ 
diff --git a/net-im/gaim-openq/files/patch-src-udp_proxy_s5.c b/net-im/gaim-openq/files/patch-src-udp_proxy_s5.c
new file mode 100644
index 000000000..af25e25f2
--- /dev/null
+++ b/net-im/gaim-openq/files/patch-src-udp_proxy_s5.c
@@ -0,0 +1,32 @@
+--- src/udp_proxy_s5.c.orig	Sat Oct  2 17:48:12 2004
++++ src/udp_proxy_s5.c	Sat Oct 16 18:35:59 2004
+@@ -37,6 +37,7 @@
+ 	struct PHB *phb = data;
+ 	struct sockaddr_in sin;
+ 	int len;
++	int error = ETIMEDOUT;
+ 
+ 	gaim_input_remove(phb->inpa);
+ 	gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Able to read again.\n");
+@@ -85,7 +86,6 @@
+ 		return;
+ 	}
+ 
+-	int error = ETIMEDOUT;
+ 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "Connect didn't block\n");
+ 	len = sizeof(error);
+ 	if (getsockopt(phb->udpsock, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
+@@ -216,11 +216,12 @@
+ {
+ 	unsigned char buf[512];
+ 	struct PHB *phb = data;
++	int ret;
+ 
+ 	gaim_input_remove(phb->inpa);
+ 	gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Able to read.\n");
+ 
+-	int ret = read(source, buf, 2);
++	ret = read(source, buf, 2);
+ 	if (ret < 2) {
+ 		gaim_debug(GAIM_DEBUG_INFO, "s5_canread", "packet smaller than 2 octet\n");
+ 		close(source);