pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/comms/gnome-pilot Fix GCC 3.3.1 related build problem.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/08b066aa484a
branches:  trunk
changeset: 462242:08b066aa484a
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Sep 28 16:14:44 2003 +0000

description:
Fix GCC 3.3.1 related build problem.

diffstat:

 comms/gnome-pilot/distinfo         |    5 +-
 comms/gnome-pilot/patches/patch-aa |   13 +++
 comms/gnome-pilot/patches/patch-ab |   13 +++
 comms/gnome-pilot/patches/patch-ac |  126 +++++++++++++++++++++++++++++++++++++
 4 files changed, 156 insertions(+), 1 deletions(-)

diffs (176 lines):

diff -r e92599c1eb6a -r 08b066aa484a comms/gnome-pilot/distinfo
--- a/comms/gnome-pilot/distinfo        Sun Sep 28 15:59:40 2003 +0000
+++ b/comms/gnome-pilot/distinfo        Sun Sep 28 16:14:44 2003 +0000
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/11 02:56:25 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/09/28 16:14:44 tron Exp $
 
 SHA1 (gnome-pilot-0.1.71.tar.bz2) = 528b3b6d053f2433c82af241ae9bd245d9fbea17
 Size (gnome-pilot-0.1.71.tar.bz2) = 679057 bytes
+SHA1 (patch-aa) = de3b48de8d08dce05b43af685dd0616544d41257
+SHA1 (patch-ab) = d0c60797a18db383467090ee995dbe2bbfb110cf
+SHA1 (patch-ac) = f4bbcb34af3928e5d933512fee71cadbf24314cd
diff -r e92599c1eb6a -r 08b066aa484a comms/gnome-pilot/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/gnome-pilot/patches/patch-aa        Sun Sep 28 16:14:44 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/09/28 16:14:45 tron Exp $
+
+--- gpilotd/orbit_daemon_glue.h.orig   2001-07-30 23:31:37.000000000 +0200
++++ gpilotd/orbit_daemon_glue.h        2003-09-28 17:56:58.000000000 +0200
+@@ -34,7 +34,7 @@
+ #ifdef GPC_DEBUG
+ #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
+                                    G_LOG_LEVEL_MESSAGE, \
+-                                   "gpilotd: "##format, ##args)
++                                   "gpilotd: " format, args)
+ #else
+ #define LOG(format,args...)
+ #endif
diff -r e92599c1eb6a -r 08b066aa484a comms/gnome-pilot/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/gnome-pilot/patches/patch-ab        Sun Sep 28 16:14:44 2003 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/09/28 16:14:45 tron Exp $
+
+--- gpilotd/queue_io.c.orig    2001-11-05 11:03:24.000000000 +0100
++++ gpilotd/queue_io.c 2003-09-28 17:59:49.000000000 +0200
+@@ -365,7 +365,7 @@
+       gchar *prefix = NULL;
+       int num;
+ 
+-      LOG("gpc_queue_purge_request()");
++      LOG("%s", "gpc_queue_purge_request()");
+ 
+       g_return_if_fail(req!=NULL);
+       g_return_if_fail(*req!=NULL);
diff -r e92599c1eb6a -r 08b066aa484a comms/gnome-pilot/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/gnome-pilot/patches/patch-ac        Sun Sep 28 16:14:44 2003 +0000
@@ -0,0 +1,126 @@
+$NetBSD: patch-ac,v 1.1 2003/09/28 16:14:45 tron Exp $
+
+--- gpilotd/orbit_daemon_glue.c.orig   2002-11-22 17:14:46.000000000 +0100
++++ gpilotd/orbit_daemon_glue.c        2003-09-28 18:11:57.000000000 +0200
+@@ -210,7 +210,7 @@
+               
+               client_id = CORBA_ORB_object_to_string(orb,cb,&ev);
+               if(ev._major != CORBA_NO_EXCEPTION) {
+-                      LOG("unable to resolve IOR for client");
++                      LOG("%s", "unable to resolve IOR for client");
+                       LOGEXN (ev);
+                       CORBA_exception_free(&ev);
+                       return NULL;
+@@ -613,18 +613,18 @@
+               CORBA_exception_init(&my_ev);
+               tmp_client_id = CORBA_ORB_object_to_string(orb,cb,&my_ev);
+               if(my_ev._major != CORBA_NO_EXCEPTION) {
+-                      LOG("*** Client appears to be disconnected...");
++                      LOG("%s", "*** Client appears to be disconnected...");
+                       LOGEXN (my_ev);
+               } else {
+-                      LOG("Client seems ok");
++                      LOG("%s", "Client seems ok");
+               }
+               tmpcb = CORBA_ORB_string_to_object(orb,(CORBA_char*)tmp_client_id,&my_ev); 
+               if(my_ev._major != CORBA_NO_EXCEPTION) {
+-                      LOG("**** Client appears to be disconnected...");
++                      LOG("%s", "**** Client appears to be disconnected...");
+                       LOGEXN (my_ev);
+                       g_assert_not_reached();
+               } else {
+-                      LOG("Client seems ok");
++                      LOG("%s", "Client seems ok");
+               }
+       }
+ #endif
+@@ -977,7 +977,7 @@
+                       CORBA_Environment *ev) 
+ {
+ 
+-      LOG("corba: get_users()");
++      LOG("%s", "corba: get_users()");
+ 
+       /* FIXME: this isn't complete, it only gives one user, and
+          doesn't make any NULL checks... */
+@@ -998,7 +998,7 @@
+                         CORBA_Environment *ev) 
+ {
+ 
+-      LOG("corba: get_cradles(...)");
++      LOG("%s", "corba: get_cradles(...)");
+ 
+       if(g_list_length(orb_context->gpilotd_context->devices)>0) {
+               GNOME_Pilot_StringSequence *cradles;
+@@ -1023,7 +1023,7 @@
+                        CORBA_Environment *ev) 
+ {
+ 
+-      LOG("corba: get_pilots(...)");
++      LOG("%s", "corba: get_pilots(...)");
+ 
+       if(g_list_length(orb_context->gpilotd_context->pilots)>0) {
+               GNOME_Pilot_StringSequence *pilots;
+@@ -1048,7 +1048,7 @@
+                           CORBA_Environment *ev) 
+ {
+ 
+-      LOG("corba: get_pilot_ids(...)");
++      LOG("%s", "corba: get_pilot_ids(...)");
+ 
+       if(g_list_length(orb_context->gpilotd_context->pilots)>0) {
+               GNOME_Pilot_LongSequence *pilots;
+@@ -1212,7 +1212,7 @@
+ gpilotd_get_pilot_id_from_name(PortableServer_Servant _servant, 
+                              CORBA_char * pilot_name, 
+                              CORBA_Environment * ev) {
+-      LOG("corba: get_user_pilot_id_from_name");
++      LOG("%s","corba: get_user_pilot_id_from_name");
+ 
+       return pilot_id_from_name(pilot_name,orb_context->gpilotd_context);
+ }
+@@ -1240,7 +1240,7 @@
+       char **databases,*pfx;
+       int num_bases;
+       guint32 pilot_id;
+-      LOG("corba: get_databases_from_cache(...)");
++      LOG("%s", "corba: get_databases_from_cache(...)");
+ 
+       pilot_id = pilot_id_from_name(pilot_name,
+                                     orb_context->gpilotd_context);
+@@ -1415,7 +1415,7 @@
+ 
+       cb = CORBA_ORB_string_to_object(orb,(CORBA_char*)IOR,&ev);
+       if(ev._major != CORBA_NO_EXCEPTION) {
+-              LOG("Client appears to be disconnected...");
++              LOG("%s", "Client appears to be disconnected...");
+               g_warning ("%s:%d Exception: %s\n",
+                          __FILE__,__LINE__, CORBA_exception_id (&ev));
+               CORBA_exception_free(&ev);
+@@ -1481,7 +1481,7 @@
+                       break;
+               }
+               if(ev._major != CORBA_NO_EXCEPTION) {
+-                      LOG("Client appears to be disconnected...");
++                      LOG("%s", "Client appears to be disconnected...");
+                       LOGEXN (ev);
+                       CORBA_exception_free(&ev);
+                       carrier->purge_list = g_slist_prepend(carrier->purge_list,
+@@ -1573,7 +1573,7 @@
+       GNOME_Pilot_Client cb;
+       gchar *pilot_name;
+ 
+-      LOG("orbed_notify_completion(...)");
++      LOG("%s", "orbed_notify_completion(...)");
+ 
+       g_return_if_fail(req!=NULL);
+       g_return_if_fail(*req!=NULL);
+@@ -1595,7 +1595,7 @@
+       /* get the ior, if it fails, print exception and purge request */
+       cb = CORBA_ORB_string_to_object(orb,(CORBA_char*)(*req)->client_id,&ev);
+       if(ev._major != CORBA_NO_EXCEPTION) {
+-              LOG("unable to resolve object for IOR");
++              LOG("%s", "unable to resolve object for IOR");
+               LOGEXN (ev);
+               CORBA_exception_free(&ev);
+               /* FIXME: This purges monitors for the client.



Home | Main Index | Thread Index | Old Index