pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/xchat-systray-integration Do not define variables...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5b3fa2f6cdaf
branches: trunk
changeset: 515707:5b3fa2f6cdaf
user: minskim <minskim%pkgsrc.org@localhost>
date: Thu Jul 06 22:04:03 2006 +0000
description:
Do not define variables in headers; define them in .c files instead.
Otherwise, they cause link errors on Darwin.
diffstat:
chat/xchat-systray-integration/distinfo | 18 ++++++-
chat/xchat-systray-integration/patches/patch-aa | 17 +++++-
chat/xchat-systray-integration/patches/patch-ac | 58 ++++++++++++++++++++++++
chat/xchat-systray-integration/patches/patch-ad | 36 +++++++++++++++
chat/xchat-systray-integration/patches/patch-ae | 34 ++++++++++++++
chat/xchat-systray-integration/patches/patch-af | 21 ++++++++
chat/xchat-systray-integration/patches/patch-ag | 59 +++++++++++++++++++++++++
chat/xchat-systray-integration/patches/patch-ah | 38 ++++++++++++++++
chat/xchat-systray-integration/patches/patch-ai | 15 ++++++
chat/xchat-systray-integration/patches/patch-aj | 14 +++++
chat/xchat-systray-integration/patches/patch-ak | 56 +++++++++++++++++++++++
chat/xchat-systray-integration/patches/patch-al | 33 +++++++++++++
chat/xchat-systray-integration/patches/patch-am | 15 ++++++
chat/xchat-systray-integration/patches/patch-an | 14 +++++
chat/xchat-systray-integration/patches/patch-ao | 13 +++++
chat/xchat-systray-integration/patches/patch-ap | 12 +++++
16 files changed, 447 insertions(+), 6 deletions(-)
diffs (truncated from 548 to 300 lines):
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/distinfo
--- a/chat/xchat-systray-integration/distinfo Thu Jul 06 22:03:39 2006 +0000
+++ b/chat/xchat-systray-integration/distinfo Thu Jul 06 22:04:03 2006 +0000
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.5 2006/07/06 21:26:23 minskim Exp $
+$NetBSD: distinfo,v 1.6 2006/07/06 22:04:03 minskim Exp $
SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab
RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab
Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes
-SHA1 (patch-aa) = 12cdc25278a2d2d4b67432a1df6b5f5b1a4a7790
+SHA1 (patch-aa) = 1afab689e88a6315201c3b1187dcdbbabc991ca8
SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487
+SHA1 (patch-ac) = f42ca3d00a9bcba15f2bd523cd54f3e606b4399f
+SHA1 (patch-ad) = 51f13e63894e2a5c391731262628dfa3ceed7a62
+SHA1 (patch-ae) = fa82c5a19fc872638d0a97e1e5eb0b8465d3a1b6
+SHA1 (patch-af) = 762fd3d13c43a90eef992a3eda25dd44240b6581
+SHA1 (patch-ag) = 7acef11d2bb5554286bf92c629663f7b6ee0d0ce
+SHA1 (patch-ah) = 4abd6aa8fadbbf7ae36afe022d03b56eb14e4f74
+SHA1 (patch-ai) = 89916065bd4c1a659a2ca9d48ee486dc05ff9f12
+SHA1 (patch-aj) = 7ae731b9181a3b9d8e148929ae17ebfdc763a687
+SHA1 (patch-ak) = e16d53b22e906983e85987bd87e90aa307b3158e
+SHA1 (patch-al) = a97c5c6b7faa10619de5c657bb5cc3b78cc43be0
+SHA1 (patch-am) = 595962817692c42b5f9e35d4f8571dd555390485
+SHA1 (patch-an) = e3cb80f89d226ace7efd39f0fd6e48e9a2dadd1e
+SHA1 (patch-ao) = a758b0f36d6de664673d77a9123180559e963ec7
+SHA1 (patch-ap) = 7f705380a7d6f72957b300d726a31b890487212a
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/patches/patch-aa
--- a/chat/xchat-systray-integration/patches/patch-aa Thu Jul 06 22:03:39 2006 +0000
+++ b/chat/xchat-systray-integration/patches/patch-aa Thu Jul 06 22:04:03 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2006/07/06 21:26:23 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/06 22:04:03 minskim Exp $
---- Makefile.orig 2004-04-30 12:38:10.000000000 +0000
+--- Makefile.orig 2004-04-30 05:38:10.000000000 -0700
+++ Makefile
-@@ -1,10 +1,10 @@
+@@ -1,15 +1,15 @@
#UNIX VARS
-CFLAGS = -Os -Wall
-GTKFLAGS =`pkg-config gtk+-2.0 --cflags`
@@ -17,6 +17,12 @@
ifndef prefix
prefix=/usr/
endif
+ plugindir = $(prefix)/lib/xchat/plugins/
+-Objects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/eggtrayicon.o src/systray.o
++Objects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/eggtrayicon.o src/systray.o src/traycoreengine.o
+
+ #WINDOWS VARS
+ GTKPREFIX=C:/DEV-CPP/include/
@@ -27,7 +27,7 @@ WINCFLAGS = $(WINGTKFLAGS) -DBUILDING_DL
WINObjects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/systray.o
@@ -26,7 +32,7 @@
else
plugin=Systray.dll
plugindir=C:/Program Files/X-Chat2/plugins/
-@@ -63,42 +63,42 @@ src/systray.o: src/systray.c
+@@ -63,42 +63,45 @@ src/systray.o: src/systray.c
else
src/eggtrayicon.o: src/libs/Unix/eggtrayicon.c
@@ -68,6 +74,9 @@
-systray.so: $(Objects)
- $(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin)
++src/traycoreengine.o: src/libs/traycoreengine.c
++ ${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/libs/traycoreengine.c -o src/traycoreengine.o
++
+systray.la: $(Objects)
+ ${SHLIBTOOL} --mode=link ${CC} $(LIBS) ${Objects:.o=.lo} -o ${plugin} -rpath ${prefix}/lib -avoid-version -module
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat-systray-integration/patches/patch-ac Thu Jul 06 22:04:03 2006 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-ac,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/away_system.h.orig 2004-04-30 05:38:10.000000000 -0700
++++ src/away_system.h
+@@ -3,31 +3,31 @@
+
+ #include "libs/traycoreengine.h"
+
+-gboolean go_change;
+-gboolean go_identify;
++extern gboolean go_change;
++extern gboolean go_identify;
+ #ifdef _WIN32_
+- HICON pix_xchat_away;
+- HICON pix_xchat;
++ extern HICON pix_xchat_away;
++ extern HICON pix_xchat;
+ #else
+- GdkPixbuf *pix_xchat_away;
+- GdkPixbuf *pix_xchat;
++ extern GdkPixbuf *pix_xchat_away;
++ extern GdkPixbuf *pix_xchat;
+ #endif
+-gboolean global_away;
+-gboolean global_away_temp;
+-char away_msg1[150];
+-char away_msg2[150];
+-char away_msg3[150];
+-char away_nick[150];
+-char away_pass[150];
+-const char* awaynick;
+-const char* amsg1;
+-const char* amsg2;
+-const char* amsg3;
+-const char* awaypass;
+-gboolean edit;
+-const char* message;
+-GtkWidget *checkbutton3;
+-GtkWidget *away_text,*away_nick_box,*away_nick_pass_box;
++extern gboolean global_away;
++extern gboolean global_away_temp;
++extern char away_msg1[150];
++extern char away_msg2[150];
++extern char away_msg3[150];
++extern char away_nick[150];
++extern char away_pass[150];
++extern const char* awaynick;
++extern const char* amsg1;
++extern const char* amsg2;
++extern const char* amsg3;
++extern const char* awaypass;
++extern gboolean edit;
++extern const char* message;
++extern GtkWidget *checkbutton3;
++extern GtkWidget *away_text,*away_nick_box,*away_nick_pass_box;
+
+
+ void get_label(GtkWidget *button, void *data);
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat-systray-integration/patches/patch-ad Thu Jul 06 22:04:03 2006 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-ad,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/away_system.c.orig 2004-04-30 05:38:10.000000000 -0700
++++ src/away_system.c
+@@ -3,6 +3,31 @@
+ #include "away_system.h"
+
+ //AWAY SYSTEM
++gboolean go_change;
++gboolean go_identify;
++#ifdef _WIN32_
++ HICON pix_xchat_away;
++ HICON pix_xchat;
++#else
++ GdkPixbuf *pix_xchat_away;
++ GdkPixbuf *pix_xchat;
++#endif
++gboolean global_away;
++gboolean global_away_temp;
++char away_msg1[150];
++char away_msg2[150];
++char away_msg3[150];
++char away_nick[150];
++char away_pass[150];
++const char* awaynick;
++const char* amsg1;
++const char* amsg2;
++const char* amsg3;
++const char* awaypass;
++gboolean edit;
++const char* message;
++GtkWidget *checkbutton3;
++GtkWidget *away_text,*away_nick_box,*away_nick_pass_box;
+
+ //get the select away msg
+ void get_label(GtkWidget *button, void *data) {
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat-systray-integration/patches/patch-ae Thu Jul 06 22:04:03 2006 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/libs/traycoreengine.h.orig 2004-04-30 05:38:10.000000000 -0700
++++ src/libs/traycoreengine.h
+@@ -35,20 +35,20 @@ MYICON loadicons(char* filename ,char* t
+ void clean_up();
+
+ //xchat plugin var
+-xchat_plugin *ph;
+-xchat_context *flash_ctx;
+-xchat_context *focus_ctx;
++extern xchat_plugin *ph;
++extern xchat_context *flash_ctx;
++extern xchat_context *focus_ctx;
+
+
+-GHashTable *servers_names;
+-gint status;
++extern GHashTable *servers_names;
++extern gint status;
+
+ #ifndef _WIN32_
+- GtkWidget *tray_icon_image;
+- GtkWidget *tray_icon;
+- GtkTooltips *tray_icon_tooltip;
++ extern GtkWidget *tray_icon_image;
++ extern GtkWidget *tray_icon;
++ extern GtkTooltips *tray_icon_tooltip;
+ #else
+- NOTIFYICONDATA tray_icon;
++ extern NOTIFYICONDATA tray_icon;
+ #endif
+
+ #endif
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat-systray-integration/patches/patch-af Thu Jul 06 22:04:03 2006 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/libs/traycoreengine.c.orig 2006-07-06 14:43:48.000000000 -0700
++++ src/libs/traycoreengine.c
+@@ -0,0 +1,16 @@
++#include "traycoreengine.h"
++
++xchat_plugin *ph;
++xchat_context *flash_ctx;
++xchat_context *focus_ctx;
++
++GHashTable *servers_names;
++gint status;
++
++#ifndef _WIN32_
++ GtkWidget *tray_icon_image;
++ GtkWidget *tray_icon;
++ GtkTooltips *tray_icon_tooltip;
++#else
++ NOTIFYICONDATA tray_icon;
++#endif
diff -r e16b475d2d70 -r 5b3fa2f6cdaf chat/xchat-systray-integration/patches/patch-ag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/xchat-systray-integration/patches/patch-ag Thu Jul 06 22:04:03 2006 +0000
@@ -0,0 +1,59 @@
+$NetBSD: patch-ag,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/data_manager.h.orig 2004-04-30 05:38:10.000000000 -0700
++++ src/data_manager.h
+@@ -5,32 +5,32 @@
+ #include "warnings.h"
+ #include "away_system.h"
+
+-gboolean highlight;
+-gboolean query;
+-gboolean disconnection;
+-gboolean kick;
+-gboolean dcc_chat;
+-gboolean dcc_send;
+-gboolean invite;
+-gboolean notify_list;
+-GtkWidget *away1,*away2,*away3;
+-GtkWidget *browser_text,*email_text,*player_text,*imagepath_text;
++extern gboolean highlight;
++extern gboolean query;
++extern gboolean disconnection;
++extern gboolean kick;
++extern gboolean dcc_chat;
++extern gboolean dcc_send;
++extern gboolean invite;
++extern gboolean notify_list;
++extern GtkWidget *away1,*away2,*away3;
++extern GtkWidget *browser_text,*email_text,*player_text,*imagepath_text;
+ //settings items
+-const char* ppath1;
+-const char* epath1;
+-const char* bpath1;
+-const char* imagepath1;
++extern const char* ppath1;
++extern const char* epath1;
++extern const char* bpath1;
++extern const char* imagepath1;
+ #ifndef _WIN32_
+- gboolean KDE;
+- gboolean window_manager_modified;
++ extern gboolean KDE;
++ extern gboolean window_manager_modified;
+ #endif
+ //settings items array
+-char ppath[150];
+-char epath[150];
+-char bpath[150];
+-char imagepath[150];
+-gint flash_interval;
+-gboolean killevent;
++extern char ppath[150];
++extern char epath[150];
++extern char bpath[150];
++extern char imagepath[150];
++extern gint flash_interval;
++extern gboolean killevent;
+
Home |
Main Index |
Thread Index |
Old Index